diff --git a/LiteLoader/include/liteloader/Version.h b/LiteLoader/include/liteloader/Version.h index 5595691d81..cff1c08aea 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 13 -#define LITELOADER_VERSION_REVISION 1 +#define LITELOADER_VERSION_MINOR 14 +#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 582 +#define TARGET_BDS_PROTOCOL_VERSION 589 #define LITELOADER_VERSION ll::getLoaderVersion() diff --git a/LiteLoader/include/llapi/SendPacketAPI.h b/LiteLoader/include/llapi/SendPacketAPI.h index 838944654f..6cdc62ab29 100644 --- a/LiteLoader/include/llapi/SendPacketAPI.h +++ b/LiteLoader/include/llapi/SendPacketAPI.h @@ -35,8 +35,9 @@ class NetworkPacket : public Packet { virtual bool isValid() const { throw("TODO"); } - virtual enum StreamReadResult _read(class ReadOnlyBinaryStream&) override { + + virtual ExtendedStreamReadResult _read(class ReadOnlyBinaryStream&) override { throw("TODO in MyPkt::_read()"); - return (enum StreamReadResult)0; + return ExtendedStreamReadResult{(enum StreamReadResult)0, ""}; } }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/Ability.hpp b/LiteLoader/include/llapi/mc/Ability.hpp index 43251048e2..c62f5ab293 100644 --- a/LiteLoader/include/llapi/mc/Ability.hpp +++ b/LiteLoader/include/llapi/mc/Ability.hpp @@ -31,14 +31,14 @@ class Ability { #endif public: - /** - * @symbol ??0Ability\@\@QEAA\@_NW4Options\@0\@\@Z - */ - MCAPI Ability(bool, enum class Ability::Options); /** * @symbol ??0Ability\@\@QEAA\@XZ */ MCAPI Ability(); + /** + * @symbol ??0Ability\@\@QEAA\@_NW4Options\@0\@\@Z + */ + MCAPI Ability(bool, enum class Ability::Options); /** * @symbol ?getBool\@Ability\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/AbstractArrow.hpp b/LiteLoader/include/llapi/mc/AbstractArrow.hpp index 4d71f7710f..c98d976496 100644 --- a/LiteLoader/include/llapi/mc/AbstractArrow.hpp +++ b/LiteLoader/include/llapi/mc/AbstractArrow.hpp @@ -47,162 +47,157 @@ class AbstractArrow : public PredictableProjectile { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 47 + * @vftbl 46 * @symbol ?lerpMotion\@AbstractArrow\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void lerpMotion(class Vec3 const &); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 79 + * @vftbl 77 * @symbol ?getShadowHeightOffs\@AbstractArrow\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 80 + * @vftbl 78 * @symbol ?getShadowRadius\@AbstractArrow\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_80(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_86(); /** - * @vftbl 89 + * @vftbl 87 * @symbol ?playerTouch\@AbstractArrow\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void playerTouch(class Player &); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_94(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_97(); + /** + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 169 + * @vftbl 167 * @symbol ?getSourceUniqueID\@AbstractArrow\@\@MEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 177 + * @vftbl 175 * @symbol ?canChangeDimensionsUsingPortal\@AbstractArrow\@\@UEBA_NXZ */ virtual bool canChangeDimensionsUsingPortal() const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@AbstractArrow\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@AbstractArrow\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 276 + * @vftbl 268 * @symbol ?shoot\@AbstractArrow\@\@UEAAXAEBVVec3\@\@MM0\@Z */ virtual void shoot(class Vec3 const &, float, float, class Vec3 const &); /** - * @vftbl 277 + * @vftbl 269 * @symbol ?_playPickupSound\@AbstractArrow\@\@MEAAXXZ */ virtual void _playPickupSound(); /** - * @vftbl 278 + * @vftbl 270 * @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 d94fa9bf88..ceba2dd89b 100644 --- a/LiteLoader/include/llapi/mc/AbstractCandleBlock.hpp +++ b/LiteLoader/include/llapi/mc/AbstractCandleBlock.hpp @@ -40,16 +40,21 @@ class AbstractCandleBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -62,14 +67,14 @@ class AbstractCandleBlock : public BlockLegacy { virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol __unk_vfn_34 + * @symbol ?isWaterBlocking\@AbstractCandleBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_34(); + virtual bool isWaterBlocking() const; /** * @vftbl 35 - * @symbol ?isWaterBlocking\@AbstractCandleBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_35 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class AbstractCandleBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,15 +136,15 @@ class AbstractCandleBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -147,131 +152,126 @@ class AbstractCandleBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@AbstractCandleBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@AbstractCandleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 113 + * @vftbl 112 * @symbol ?entityInside\@AbstractCandleBlock\@\@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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@AbstractCandleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 154 + * @vftbl 152 * @symbol ?getLightEmission\@AbstractCandleBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@AbstractCandleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 195 + * @vftbl 194 * @symbol ?_getNumCandles\@AbstractCandleBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int _getNumCandles(class Block const &) const; /** - * @vftbl 196 + * @vftbl 195 * @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 197 + * @vftbl 196 * @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 00816027ba..27ea984fe7 100644 --- a/LiteLoader/include/llapi/mc/AbstractCompassItem.hpp +++ b/LiteLoader/include/llapi/mc/AbstractCompassItem.hpp @@ -34,11 +34,6 @@ class AbstractCompassItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -54,6 +49,11 @@ class AbstractCompassItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -105,12 +105,22 @@ class AbstractCompassItem : public Item { */ virtual void __unk_vfn_80(); /** - * @vftbl 118 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 120 * @symbol ?getIconInfo\@AbstractCompassItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 120 + * @vftbl 122 * @symbol ?getAnimationFrameFor\@AbstractCompassItem\@\@UEBAHPEAVMob\@\@_NPEBVItemStack\@\@_N\@Z */ virtual int getAnimationFrameFor(class Mob *, bool, class ItemStack const *, bool) const; diff --git a/LiteLoader/include/llapi/mc/AccessedBlockSourceBlock.hpp b/LiteLoader/include/llapi/mc/AccessedBlockSourceBlock.hpp index c52ffb3f93..f1e935fa46 100644 --- a/LiteLoader/include/llapi/mc/AccessedBlockSourceBlock.hpp +++ b/LiteLoader/include/llapi/mc/AccessedBlockSourceBlock.hpp @@ -27,10 +27,6 @@ struct AccessedBlockSourceBlock { #endif public: - /** - * @symbol ??0AccessedBlockSourceBlock\@\@QEAA\@$$QEAU0\@\@Z - */ - MCAPI AccessedBlockSourceBlock(struct AccessedBlockSourceBlock &&); /** * @symbol ??1AccessedBlockSourceBlock\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ActivatorRailBlock.hpp b/LiteLoader/include/llapi/mc/ActivatorRailBlock.hpp index 728441b101..38b6d012d4 100644 --- a/LiteLoader/include/llapi/mc/ActivatorRailBlock.hpp +++ b/LiteLoader/include/llapi/mc/ActivatorRailBlock.hpp @@ -40,16 +40,21 @@ class ActivatorRailBlock : public BaseRailBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class ActivatorRailBlock : public BaseRailBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class ActivatorRailBlock : public BaseRailBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,115 +131,110 @@ class ActivatorRailBlock : public BaseRailBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 73 + * @vftbl 72 * @symbol ?onRedstoneUpdate\@ActivatorRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@ActivatorRailBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 c52149a364..469ce6bf96 100644 --- a/LiteLoader/include/llapi/mc/Actor.hpp +++ b/LiteLoader/include/llapi/mc/Actor.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "VehicleUtils.hpp" #define BEFORE_EXTRA // Add include headers & pre-declares @@ -213,434 +212,434 @@ class Actor { virtual void remove(); /** * @vftbl 20 - * @symbol ?setPos\@Actor\@\@UEAAXAEBVVec3\@\@\@Z - */ - virtual void setPos(class Vec3 const &); - /** - * @vftbl 21 * @symbol ?isRuntimePredictedMovementEnabled\@Actor\@\@UEBA_NXZ */ virtual bool isRuntimePredictedMovementEnabled() const; /** - * @vftbl 22 + * @vftbl 21 * @symbol ?getPredictedMovementValues\@Actor\@\@UEBAAEBUPredictedMovementValues\@\@XZ */ virtual struct PredictedMovementValues const & getPredictedMovementValues() const; /** - * @vftbl 23 + * @vftbl 22 * @symbol ?getPosition\@Actor\@\@UEBAAEBVVec3\@\@XZ */ virtual class Vec3 const & getPosition() const; /** - * @vftbl 24 + * @vftbl 23 * @symbol ?getPosPrev\@Actor\@\@UEBAAEBVVec3\@\@XZ */ virtual class Vec3 const & getPosPrev() const; /** - * @vftbl 25 + * @vftbl 24 * @symbol ?getPosExtrapolated\@Actor\@\@UEBA?BVVec3\@\@M\@Z */ virtual class Vec3 const getPosExtrapolated(float) const; /** - * @vftbl 26 + * @vftbl 25 * @symbol ?getAttachPos\@Actor\@\@UEBA?AVVec3\@\@W4ActorLocation\@\@M\@Z */ virtual class Vec3 getAttachPos(enum class ActorLocation, float) const; /** - * @vftbl 27 + * @vftbl 26 * @symbol ?getFiringPos\@Actor\@\@UEBA?AVVec3\@\@XZ */ virtual class Vec3 getFiringPos() const; /** - * @vftbl 28 + * @vftbl 27 * @symbol ?move\@Actor\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void move(class Vec3 const &); /** - * @vftbl 29 + * @vftbl 28 * @symbol ?move\@Actor\@\@UEBAXAEAUIActorMovementProxy\@\@AEBVVec3\@\@\@Z */ virtual void move(struct IActorMovementProxy &, class Vec3 const &) const; /** - * @vftbl 30 + * @vftbl 29 * @symbol ?getInterpolatedRidingPosition\@Actor\@\@UEBA?AVVec3\@\@M\@Z */ virtual class Vec3 getInterpolatedRidingPosition(float) const; /** - * @vftbl 31 + * @vftbl 30 * @symbol ?getInterpolatedBodyRot\@Actor\@\@UEBAMM\@Z */ virtual float getInterpolatedBodyRot(float) const; /** - * @vftbl 32 + * @vftbl 31 * @symbol ?getInterpolatedHeadRot\@Actor\@\@UEBAMM\@Z */ virtual float getInterpolatedHeadRot(float) const; /** - * @vftbl 33 + * @vftbl 32 * @symbol ?getInterpolatedBodyYaw\@Actor\@\@UEBAMM\@Z */ virtual float getInterpolatedBodyYaw(float) const; /** - * @vftbl 34 + * @vftbl 33 * @symbol ?getYawSpeedInDegreesPerSecond\@Actor\@\@UEBAMXZ */ virtual float getYawSpeedInDegreesPerSecond() const; /** - * @vftbl 35 + * @vftbl 34 * @symbol ?getInterpolatedWalkAnimSpeed\@Actor\@\@UEBAMM\@Z */ virtual float getInterpolatedWalkAnimSpeed(float) const; /** - * @vftbl 36 + * @vftbl 35 * @symbol ?getInterpolatedRidingOffset\@Actor\@\@UEBA?AVVec3\@\@MH\@Z */ virtual class Vec3 getInterpolatedRidingOffset(float, int) const; /** - * @vftbl 37 + * @vftbl 36 * @symbol ?resetInterpolated\@Actor\@\@UEAAXXZ */ virtual void resetInterpolated(); /** - * @vftbl 38 + * @vftbl 37 * @symbol ?updateEntityInside\@Actor\@\@UEAAXAEBVAABB\@\@\@Z */ virtual void updateEntityInside(class AABB const &); /** - * @vftbl 39 + * @vftbl 38 * @symbol ?updateEntityInside\@Actor\@\@UEAAXXZ */ virtual void updateEntityInside(); /** - * @vftbl 40 + * @vftbl 39 * @symbol ?isFireImmune\@Actor\@\@UEBA_NXZ */ virtual bool isFireImmune() const; /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 42 + * @vftbl 41 * @symbol ?blockedByShield\@Actor\@\@UEAAXAEBVActorDamageSource\@\@AEAV1\@\@Z */ virtual void blockedByShield(class ActorDamageSource const &, class Actor &); /** - * @vftbl 43 + * @vftbl 42 * @symbol ?canDisableShield\@Actor\@\@UEAA_NXZ */ virtual bool canDisableShield(); /** - * @vftbl 44 + * @vftbl 43 * @symbol ?teleportTo\@Actor\@\@UEAAXAEBVVec3\@\@_NHH1\@Z */ virtual void teleportTo(class Vec3 const &, bool, int, int, bool); /** - * @vftbl 45 + * @vftbl 44 * @symbol ?tryTeleportTo\@Actor\@\@UEAA_NAEBVVec3\@\@_N1HH\@Z */ virtual bool tryTeleportTo(class Vec3 const &, bool, bool, int, int); /** - * @vftbl 46 + * @vftbl 45 * @symbol ?chorusFruitTeleport\@Actor\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void chorusFruitTeleport(class Vec3 const &); /** - * @vftbl 47 + * @vftbl 46 * @symbol ?lerpMotion\@Actor\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void lerpMotion(class Vec3 const &); /** - * @vftbl 48 + * @vftbl 47 * @symbol ?tryCreateAddActorPacket\@Actor\@\@UEAA?AV?$unique_ptr\@VAddActorBasePacket\@\@U?$default_delete\@VAddActorBasePacket\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr tryCreateAddActorPacket(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@Actor\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 50 + * @vftbl 49 * @symbol ?baseTick\@Actor\@\@UEAAXXZ */ virtual void baseTick(); /** - * @vftbl 51 + * @vftbl 50 * @symbol ?passengerTick\@Actor\@\@UEAAXXZ */ virtual void passengerTick(); /** - * @vftbl 52 + * @vftbl 51 * @symbol ?positionPassenger\@Actor\@\@UEAAXAEAV1\@M\@Z */ virtual void positionPassenger(class Actor &, float); /** - * @vftbl 53 + * @vftbl 52 * @symbol ?startRiding\@Actor\@\@UEAA_NAEAV1\@\@Z */ virtual bool startRiding(class Actor &); /** - * @vftbl 54 + * @vftbl 53 * @symbol ?addPassenger\@Actor\@\@UEAAXAEAV1\@\@Z */ virtual void addPassenger(class Actor &); /** - * @vftbl 55 + * @vftbl 54 * @symbol ?flagPassengerToRemove\@Actor\@\@UEAAXAEAV1\@\@Z */ virtual void flagPassengerToRemove(class Actor &); /** - * @vftbl 56 + * @vftbl 55 * @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 57 + * @vftbl 56 * @symbol ?getEntityLocNameString\@Actor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getEntityLocNameString() const; /** - * @vftbl 58 + * @vftbl 57 * @symbol ?intersects\@Actor\@\@UEBA_NAEBVVec3\@\@0\@Z */ virtual bool intersects(class Vec3 const &, class Vec3 const &) const; /** - * @vftbl 59 + * @vftbl 58 * @symbol ?isInWall\@Actor\@\@UEBA_NXZ */ virtual bool isInWall() const; /** - * @vftbl 60 + * @vftbl 59 * @symbol ?isInvisible\@Actor\@\@UEBA_NXZ */ virtual bool isInvisible() const; /** - * @vftbl 61 + * @vftbl 60 * @symbol ?canShowNameTag\@Actor\@\@UEBA_NXZ */ virtual bool canShowNameTag() const; /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 63 + * @vftbl 62 * @symbol ?setNameTagVisible\@Actor\@\@UEAAX_N\@Z */ virtual void setNameTagVisible(bool); /** - * @vftbl 64 + * @vftbl 63 * @symbol ?getNameTag\@Actor\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getNameTag() const; /** - * @vftbl 65 + * @vftbl 64 * @symbol ?getNameTagAsHash\@Actor\@\@UEBA_KXZ */ virtual unsigned __int64 getNameTagAsHash() const; /** - * @vftbl 66 + * @vftbl 65 * @symbol ?getFormattedNameTag\@Actor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getFormattedNameTag() const; /** - * @vftbl 67 + * @vftbl 66 * @symbol ?filterFormattedNameTag\@Actor\@\@UEAAXAEBVUIProfanityContext\@\@\@Z */ virtual void filterFormattedNameTag(class UIProfanityContext const &); /** - * @vftbl 68 + * @vftbl 67 * @symbol ?setNameTag\@Actor\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void setNameTag(std::string const &); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 70 + * @vftbl 69 * @symbol ?setScoreTag\@Actor\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void setScoreTag(std::string const &); /** - * @vftbl 71 + * @vftbl 70 * @symbol ?getScoreTag\@Actor\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getScoreTag() const; /** - * @vftbl 72 + * @vftbl 71 * @symbol ?isInWater\@Actor\@\@UEBA_NXZ */ virtual bool isInWater() const; /** - * @vftbl 73 - * @symbol ?isInLava\@Actor\@\@UEBA_NAEBVIConstBlockSource\@\@\@Z - */ - virtual bool isInLava(class IConstBlockSource const &) const; - /** - * @vftbl 74 + * @vftbl 72 * @symbol ?isUnderLiquid\@Actor\@\@UEBA_NW4MaterialType\@\@\@Z */ virtual bool isUnderLiquid(enum class MaterialType) const; /** - * @vftbl 75 + * @vftbl 73 * @symbol ?isOverWater\@Actor\@\@UEBA_NXZ */ virtual bool isOverWater() const; /** - * @vftbl 76 + * @vftbl 74 * @symbol ?setBlockMovementSlowdownMultiplier\@Actor\@\@UEAAXAEBVBlockLegacy\@\@AEBVVec3\@\@\@Z */ virtual void setBlockMovementSlowdownMultiplier(class BlockLegacy const &, class Vec3 const &); /** - * @vftbl 77 + * @vftbl 75 * @symbol ?resetBlockMovementSlowdownMultiplier\@Actor\@\@UEAAXXZ */ virtual void resetBlockMovementSlowdownMultiplier(); /** - * @vftbl 78 + * @vftbl 76 * @symbol ?getCameraOffset\@Actor\@\@UEBAMXZ */ virtual float getCameraOffset() const; /** - * @vftbl 79 + * @vftbl 77 * @symbol ?getShadowHeightOffs\@Actor\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 80 + * @vftbl 78 * @symbol ?getShadowRadius\@Actor\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 81 + * @vftbl 79 * @symbol ?getHeadLookVector\@Actor\@\@UEBA?AVVec3\@\@M\@Z */ virtual class Vec3 getHeadLookVector(float) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 83 + * @vftbl 81 * @symbol ?canSee\@Actor\@\@UEBA_NAEBV1\@\@Z */ virtual bool canSee(class Actor const &) const; /** - * @vftbl 84 + * @vftbl 82 * @symbol ?canSee\@Actor\@\@UEBA_NAEBVVec3\@\@\@Z */ virtual bool canSee(class Vec3 const &) const; /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 83 + * @symbol ?canInteractWithOtherEntitiesInGame\@Actor\@\@UEBA_NXZ */ - virtual void __unk_vfn_85(); + virtual bool canInteractWithOtherEntitiesInGame() const; /** - * @vftbl 86 + * @vftbl 84 * @symbol ?isSkyLit\@Actor\@\@UEAA_NM\@Z */ virtual bool isSkyLit(float); /** - * @vftbl 87 + * @vftbl 85 * @symbol ?getBrightness\@Actor\@\@UEBAMMAEBVIConstBlockSource\@\@\@Z */ virtual float getBrightness(float, class IConstBlockSource const &) const; /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_86(); /** - * @vftbl 89 + * @vftbl 87 * @symbol ?playerTouch\@Actor\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void playerTouch(class Player &); /** - * @vftbl 90 + * @vftbl 88 * @symbol ?onAboveBubbleColumn\@Actor\@\@UEAAX_N\@Z */ virtual void onAboveBubbleColumn(bool); /** - * @vftbl 91 + * @vftbl 89 * @symbol ?onInsideBubbleColumn\@Actor\@\@UEAAX_N\@Z */ virtual void onInsideBubbleColumn(bool); /** - * @vftbl 92 + * @vftbl 90 * @symbol ?isImmobile\@Actor\@\@UEBA_NXZ */ virtual bool isImmobile() const; /** - * @vftbl 93 + * @vftbl 91 * @symbol ?isSilent\@Actor\@\@UEBA_NXZ */ virtual bool isSilent() const; /** - * @vftbl 94 + * @vftbl 92 * @symbol ?isSilentObserver\@Actor\@\@UEBA_NXZ */ virtual bool isSilentObserver() const; /** - * @vftbl 95 + * @vftbl 93 * @symbol ?isPickable\@Actor\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_94(); /** - * @vftbl 97 + * @vftbl 95 * @symbol ?isSleeping\@Actor\@\@UEBA_NXZ */ virtual bool isSleeping() const; /** - * @vftbl 98 + * @vftbl 96 * @symbol ?setSleeping\@Actor\@\@UEAAX_N\@Z */ virtual void setSleeping(bool); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_97(); /** - * @vftbl 100 + * @vftbl 98 * @symbol ?setSneaking\@Actor\@\@UEAAX_N\@Z */ virtual void setSneaking(bool); /** - * @vftbl 101 + * @vftbl 99 * @symbol ?isBlocking\@Actor\@\@UEBA_NXZ */ virtual bool isBlocking() const; /** - * @vftbl 102 + * @vftbl 100 * @symbol ?isDamageBlocked\@Actor\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isDamageBlocked(class ActorDamageSource const &) const; /** - * @vftbl 103 + * @vftbl 101 * @symbol ?isAlive\@Actor\@\@UEBA_NXZ */ virtual bool isAlive() const; /** - * @vftbl 104 + * @vftbl 102 * @symbol ?isOnFire\@Actor\@\@UEBA_NXZ */ virtual bool isOnFire() const; /** - * @vftbl 105 + * @vftbl 103 * @symbol ?isOnHotBlock\@Actor\@\@UEBA_NXZ */ virtual bool isOnHotBlock() const; + /** + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 105 + * @symbol ?isSurfaceMob\@Actor\@\@UEBA_NXZ + */ + virtual bool isSurfaceMob() const; /** * @vftbl 106 * @symbol __unk_vfn_106 @@ -648,14 +647,14 @@ class Actor { virtual void __unk_vfn_106(); /** * @vftbl 107 - * @symbol ?isSurfaceMob\@Actor\@\@UEBA_NXZ + * @symbol __unk_vfn_107 */ - virtual bool isSurfaceMob() const; + virtual void __unk_vfn_107(); /** * @vftbl 108 - * @symbol __unk_vfn_108 + * @symbol ?isRemotePlayer\@Actor\@\@UEBA_NXZ */ - virtual void __unk_vfn_108(); + virtual bool isRemotePlayer() const; /** * @vftbl 109 * @symbol __unk_vfn_109 @@ -663,826 +662,786 @@ class Actor { virtual void __unk_vfn_109(); /** * @vftbl 110 - * @symbol ?isRemotePlayer\@Actor\@\@UEBA_NXZ - */ - virtual bool isRemotePlayer() const; - /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 112 * @symbol ?isAffectedByWaterBottle\@Actor\@\@UEBA_NXZ */ virtual bool isAffectedByWaterBottle() const; /** - * @vftbl 113 + * @vftbl 111 * @symbol ?canAttack\@Actor\@\@UEBA_NPEAV1\@_N\@Z */ virtual bool canAttack(class Actor *, bool) const; /** - * @vftbl 114 + * @vftbl 112 * @symbol ?setTarget\@Actor\@\@UEAAXPEAV1\@\@Z */ virtual void setTarget(class Actor *); /** - * @vftbl 115 + * @vftbl 113 * @symbol ?isValidTarget\@Actor\@\@UEBA_NPEAV1\@\@Z */ virtual bool isValidTarget(class Actor *) const; /** - * @vftbl 116 + * @vftbl 114 * @symbol ?attack\@Actor\@\@UEAA_NAEAV1\@AEBW4ActorDamageCause\@\@\@Z */ virtual bool attack(class Actor &, enum class ActorDamageCause const &); /** - * @vftbl 117 + * @vftbl 115 * @symbol ?performRangedAttack\@Actor\@\@UEAAXAEAV1\@M\@Z */ virtual void performRangedAttack(class Actor &, float); /** - * @vftbl 118 + * @vftbl 116 * @symbol ?getEquipmentCount\@Actor\@\@UEBAHXZ */ virtual int getEquipmentCount() const; /** - * @vftbl 119 + * @vftbl 117 * @symbol ?setOwner\@Actor\@\@UEAAXUActorUniqueID\@\@\@Z */ virtual void setOwner(struct ActorUniqueID); /** - * @vftbl 120 + * @vftbl 118 * @symbol ?setSitting\@Actor\@\@UEAAX_N\@Z */ virtual void setSitting(bool); /** - * @vftbl 121 + * @vftbl 119 * @symbol ?onTame\@Actor\@\@UEAAXXZ */ virtual void onTame(); /** - * @vftbl 122 + * @vftbl 120 * @symbol ?onFailedTame\@Actor\@\@UEAAXXZ */ virtual void onFailedTame(); /** - * @vftbl 123 + * @vftbl 121 * @symbol ?getInventorySize\@Actor\@\@UEBAHXZ */ virtual int getInventorySize() const; /** - * @vftbl 124 + * @vftbl 122 * @symbol ?getEquipSlots\@Actor\@\@UEBAHXZ */ virtual int getEquipSlots() const; /** - * @vftbl 125 + * @vftbl 123 * @symbol ?getChestSlots\@Actor\@\@UEBAHXZ */ virtual int getChestSlots() const; /** - * @vftbl 126 + * @vftbl 124 * @symbol ?setStanding\@Actor\@\@UEAAX_N\@Z */ virtual void setStanding(bool); /** - * @vftbl 127 + * @vftbl 125 * @symbol ?canPowerJump\@Actor\@\@UEBA_NXZ */ virtual bool canPowerJump() const; /** - * @vftbl 128 + * @vftbl 126 * @symbol ?setCanPowerJump\@Actor\@\@UEAAX_N\@Z */ virtual void setCanPowerJump(bool); /** - * @vftbl 129 + * @vftbl 127 * @symbol ?isEnchanted\@Actor\@\@UEBA_NXZ */ virtual bool isEnchanted() const; /** - * @vftbl 130 + * @vftbl 128 * @symbol ?vehicleLanded\@Actor\@\@UEAAXAEBVVec3\@\@0\@Z */ virtual void vehicleLanded(class Vec3 const &, class Vec3 const &); /** - * @vftbl 131 + * @vftbl 129 * @symbol ?shouldRender\@Actor\@\@UEBA_NXZ */ virtual bool shouldRender() const; /** - * @vftbl 132 + * @vftbl 130 * @symbol ?playAmbientSound\@Actor\@\@UEAAXXZ */ virtual void playAmbientSound(); /** - * @vftbl 133 + * @vftbl 131 * @symbol ?getAmbientSound\@Actor\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getAmbientSound() const; /** - * @vftbl 134 + * @vftbl 132 * @symbol ?isInvulnerableTo\@Actor\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 135 + * @vftbl 133 * @symbol ?getBlockDamageCause\@Actor\@\@UEBA?AW4ActorDamageCause\@\@AEBVBlock\@\@\@Z */ virtual enum class ActorDamageCause getBlockDamageCause(class Block const &) const; /** - * @vftbl 136 + * @vftbl 134 * @symbol ?animateHurt\@Actor\@\@UEAAXXZ */ virtual void animateHurt(); /** - * @vftbl 137 + * @vftbl 135 * @symbol ?doFireHurt\@Actor\@\@UEAA_NH\@Z */ virtual bool doFireHurt(int); /** - * @vftbl 138 + * @vftbl 136 * @symbol ?onLightningHit\@Actor\@\@UEAAXXZ */ virtual void onLightningHit(); /** - * @vftbl 139 + * @vftbl 137 * @symbol ?onBounceStarted\@Actor\@\@UEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void onBounceStarted(class BlockPos const &, class Block const &); /** - * @vftbl 140 + * @vftbl 138 * @symbol ?feed\@Actor\@\@UEAAXH\@Z */ virtual void feed(int); /** - * @vftbl 141 + * @vftbl 139 * @symbol ?handleEntityEvent\@Actor\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 142 + * @vftbl 140 * @symbol ?getPickRadius\@Actor\@\@UEAAMXZ */ virtual float getPickRadius(); /** - * @vftbl 143 + * @vftbl 141 * @symbol ?getActorRendererId\@Actor\@\@UEBAAEBVHashedString\@\@XZ */ virtual class HashedString const & getActorRendererId() const; /** - * @vftbl 144 + * @vftbl 142 * @symbol ?spawnAtLocation\@Actor\@\@UEAAPEAVItemActor\@\@HH\@Z */ virtual class ItemActor * spawnAtLocation(int, int); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?spawnAtLocation\@Actor\@\@UEAAPEAVItemActor\@\@HHM\@Z */ virtual class ItemActor * spawnAtLocation(int, int, float); /** - * @vftbl 146 + * @vftbl 144 * @symbol ?spawnAtLocation\@Actor\@\@UEAAPEAVItemActor\@\@AEBVItemStack\@\@M\@Z */ virtual class ItemActor * spawnAtLocation(class ItemStack const &, float); /** - * @vftbl 147 + * @vftbl 145 * @symbol ?despawn\@Actor\@\@UEAAXXZ */ virtual void despawn(); /** - * @vftbl 148 + * @vftbl 146 * @symbol ?killed\@Actor\@\@UEAAXAEAV1\@\@Z */ virtual void killed(class Actor &); /** - * @vftbl 149 + * @vftbl 147 * @symbol ?awardKillScore\@Actor\@\@UEAAXAEAV1\@H\@Z */ virtual void awardKillScore(class Actor &, int); /** - * @vftbl 150 + * @vftbl 148 * @symbol ?setArmor\@Actor\@\@UEAAXW4ArmorSlot\@\@AEBVItemStack\@\@\@Z */ virtual void setArmor(enum class ArmorSlot, class ItemStack const &); /** - * @vftbl 151 + * @vftbl 149 * @symbol ?getArmor\@Actor\@\@UEBAAEBVItemStack\@\@W4ArmorSlot\@\@\@Z */ virtual class ItemStack const & getArmor(enum class ArmorSlot) const; /** - * @vftbl 152 + * @vftbl 150 * @symbol ?getAllArmor\@Actor\@\@UEBA?AV?$vector\@PEBVItemStack\@\@V?$allocator\@PEBVItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getAllArmor() const; /** - * @vftbl 153 + * @vftbl 151 * @symbol ?getArmorMaterialTypeInSlot\@Actor\@\@UEBA?AW4ArmorMaterialType\@\@W4ArmorSlot\@\@\@Z */ virtual enum class ArmorMaterialType getArmorMaterialTypeInSlot(enum class ArmorSlot) const; /** - * @vftbl 154 + * @vftbl 152 * @symbol ?getArmorMaterialTextureTypeInSlot\@Actor\@\@UEBA?AW4ArmorTextureType\@\@W4ArmorSlot\@\@\@Z */ virtual enum class ArmorTextureType getArmorMaterialTextureTypeInSlot(enum class ArmorSlot) const; /** - * @vftbl 155 + * @vftbl 153 * @symbol ?getArmorColorInSlot\@Actor\@\@UEBAMW4ArmorSlot\@\@H\@Z */ virtual float getArmorColorInSlot(enum class ArmorSlot, int) const; /** - * @vftbl 156 + * @vftbl 154 * @symbol ?getEquippedSlot\@Actor\@\@UEBAAEBVItemStack\@\@W4EquipmentSlot\@\@\@Z */ virtual class ItemStack const & getEquippedSlot(enum class EquipmentSlot) const; /** - * @vftbl 157 + * @vftbl 155 * @symbol ?setEquippedSlot\@Actor\@\@UEAAXW4EquipmentSlot\@\@AEBVItemStack\@\@\@Z */ virtual void setEquippedSlot(enum class EquipmentSlot, class ItemStack const &); /** - * @vftbl 158 + * @vftbl 156 * @symbol ?setCarriedItem\@Actor\@\@UEAAXAEBVItemStack\@\@\@Z */ virtual void setCarriedItem(class ItemStack const &); /** - * @vftbl 159 + * @vftbl 157 * @symbol ?getCarriedItem\@Actor\@\@UEBAAEBVItemStack\@\@XZ */ virtual class ItemStack const & getCarriedItem() const; /** - * @vftbl 160 + * @vftbl 158 * @symbol ?setOffhandSlot\@Actor\@\@UEAAXAEBVItemStack\@\@\@Z */ virtual void setOffhandSlot(class ItemStack const &); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?getEquippedTotem\@Actor\@\@UEBAAEBVItemStack\@\@XZ */ virtual class ItemStack const & getEquippedTotem() const; /** - * @vftbl 162 + * @vftbl 160 * @symbol ?consumeTotem\@Actor\@\@UEAA_NXZ */ virtual bool consumeTotem(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?save\@Actor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 164 + * @vftbl 162 * @symbol ?saveWithoutId\@Actor\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void saveWithoutId(class CompoundTag &) const; /** - * @vftbl 165 + * @vftbl 163 * @symbol ?load\@Actor\@\@UEAA_NAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual bool load(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 166 + * @vftbl 164 * @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 167 + * @vftbl 165 * @symbol ?getEntityTypeId\@Actor\@\@UEBA?AW4ActorType\@\@XZ */ virtual enum class ActorType getEntityTypeId() const; /** - * @vftbl 168 + * @vftbl 166 * @symbol ?queryEntityRenderer\@Actor\@\@UEBAAEBVHashedString\@\@XZ */ virtual class HashedString const & queryEntityRenderer() const; /** - * @vftbl 169 + * @vftbl 167 * @symbol ?getSourceUniqueID\@Actor\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 170 + * @vftbl 168 * @symbol ?thawFreezeEffect\@Actor\@\@UEAAXXZ */ virtual void thawFreezeEffect(); /** - * @vftbl 171 + * @vftbl 169 * @symbol ?canFreeze\@Actor\@\@UEBA_NXZ */ virtual bool canFreeze() const; /** - * @vftbl 172 + * @vftbl 170 * @symbol ?isWearingLeatherArmor\@Actor\@\@UEBA?B_NXZ */ virtual bool const isWearingLeatherArmor() const; /** - * @vftbl 173 + * @vftbl 171 * @symbol ?getLiquidAABB\@Actor\@\@UEBA?AVAABB\@\@W4MaterialType\@\@\@Z */ virtual class AABB getLiquidAABB(enum class MaterialType) const; /** - * @vftbl 174 + * @vftbl 172 * @symbol ?handleInsidePortal\@Actor\@\@UEAAXAEBVBlockPos\@\@\@Z */ virtual void handleInsidePortal(class BlockPos const &); /** - * @vftbl 175 + * @vftbl 173 * @symbol ?getPortalCooldown\@Actor\@\@UEBAHXZ */ virtual int getPortalCooldown() const; /** - * @vftbl 176 + * @vftbl 174 * @symbol ?getPortalWaitTime\@Actor\@\@UEBAHXZ */ virtual int getPortalWaitTime() const; /** - * @vftbl 177 + * @vftbl 175 * @symbol ?canChangeDimensionsUsingPortal\@Actor\@\@UEBA_NXZ */ virtual bool canChangeDimensionsUsingPortal() const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 179 + * @vftbl 177 * @symbol ?changeDimension\@Actor\@\@UEAAXV?$AutomaticID\@VDimension\@\@H\@\@\@Z */ virtual void changeDimension(class AutomaticID); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?getControllingPlayer\@Actor\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getControllingPlayer() const; /** - * @vftbl 181 + * @vftbl 179 * @symbol ?checkFallDamage\@Actor\@\@UEAAXM_N\@Z */ virtual void checkFallDamage(float, bool); /** - * @vftbl 182 + * @vftbl 180 * @symbol ?causeFallDamage\@Actor\@\@UEAAXMMVActorDamageSource\@\@\@Z */ virtual void causeFallDamage(float, float, class ActorDamageSource); /** - * @vftbl 183 + * @vftbl 181 * @symbol ?handleFallDistanceOnServer\@Actor\@\@UEAAXMM_N\@Z */ virtual void handleFallDistanceOnServer(float, float, bool); /** - * @vftbl 184 + * @vftbl 182 * @symbol ?playSynchronizedSound\@Actor\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@AEBVBlock\@\@_N\@Z */ virtual void playSynchronizedSound(enum class LevelSoundEvent, class Vec3 const &, class Block const &, bool); /** - * @vftbl 185 + * @vftbl 183 * @symbol ?playSynchronizedSound\@Actor\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@H_N\@Z */ virtual void playSynchronizedSound(enum class LevelSoundEvent, class Vec3 const &, int, bool); /** - * @vftbl 186 + * @vftbl 184 * @symbol ?onSynchedFlagUpdate\@Actor\@\@UEAAXH_J0\@Z */ virtual void onSynchedFlagUpdate(int, __int64, __int64); /** - * @vftbl 187 + * @vftbl 185 * @symbol ?onSynchedDataUpdate\@Actor\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 188 + * @vftbl 186 * @symbol ?canAddPassenger\@Actor\@\@UEBA_NAEAV1\@\@Z */ virtual bool canAddPassenger(class Actor &) const; /** - * @vftbl 189 + * @vftbl 187 * @symbol ?canPickupItem\@Actor\@\@UEBA_NAEBVItemStack\@\@\@Z */ virtual bool canPickupItem(class ItemStack const &) const; /** - * @vftbl 190 + * @vftbl 188 * @symbol ?canBePulledIntoVehicle\@Actor\@\@UEBA_NXZ */ virtual bool canBePulledIntoVehicle() const; /** - * @vftbl 191 + * @vftbl 189 * @symbol ?inCaravan\@Actor\@\@UEBA_NXZ */ virtual bool inCaravan() const; /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 193 + * @vftbl 191 * @symbol ?tickLeash\@Actor\@\@UEAAXXZ */ virtual void tickLeash(); /** - * @vftbl 194 + * @vftbl 192 * @symbol ?sendMotionPacketIfNeeded\@Actor\@\@UEAAXXZ */ virtual void sendMotionPacketIfNeeded(); /** - * @vftbl 195 + * @vftbl 193 * @symbol ?canSynchronizeNewEntity\@Actor\@\@UEBA_NXZ */ virtual bool canSynchronizeNewEntity() const; /** - * @vftbl 196 + * @vftbl 194 * @symbol ?stopRiding\@Actor\@\@UEAAX_N00\@Z */ virtual void stopRiding(bool, bool, bool); /** - * @vftbl 197 + * @vftbl 195 * @symbol ?startSwimming\@Actor\@\@UEAAXXZ */ virtual void startSwimming(); /** - * @vftbl 198 + * @vftbl 196 * @symbol ?stopSwimming\@Actor\@\@UEAAXXZ */ virtual void stopSwimming(); /** - * @vftbl 199 + * @vftbl 197 * @symbol ?buildDebugInfo\@Actor\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void buildDebugInfo(std::string &) const; /** - * @vftbl 200 + * @vftbl 198 * @symbol ?getCommandPermissionLevel\@Actor\@\@UEBA?AW4CommandPermissionLevel\@\@XZ */ virtual enum class CommandPermissionLevel getCommandPermissionLevel() const; /** - * @vftbl 201 + * @vftbl 199 * @symbol ?isClientSide\@Actor\@\@UEBA_NXZ */ virtual bool isClientSide() const; /** - * @vftbl 202 + * @vftbl 200 * @symbol ?getMutableAttribute\@Actor\@\@UEAAPEAVAttributeInstance\@\@AEBVAttribute\@\@\@Z */ virtual class AttributeInstance * getMutableAttribute(class Attribute const &); /** - * @vftbl 203 + * @vftbl 201 * @symbol ?getAttribute\@Actor\@\@UEBAAEBVAttributeInstance\@\@AEBVAttribute\@\@\@Z */ virtual class AttributeInstance const & getAttribute(class Attribute const &) const; /** - * @vftbl 204 + * @vftbl 202 * @symbol ?getDeathTime\@Actor\@\@UEBAHXZ */ virtual int getDeathTime() const; /** - * @vftbl 205 + * @vftbl 203 * @symbol ?heal\@Actor\@\@UEAAXH\@Z */ virtual void heal(int); /** - * @vftbl 206 + * @vftbl 204 * @symbol ?isInvertedHealAndHarm\@Actor\@\@UEBA_NXZ */ virtual bool isInvertedHealAndHarm() const; /** - * @vftbl 207 + * @vftbl 205 * @symbol ?canBeAffected\@Actor\@\@UEBA_NI\@Z */ virtual bool canBeAffected(unsigned int) const; /** - * @vftbl 208 + * @vftbl 206 * @symbol ?canBeAffectedByArrow\@Actor\@\@UEBA_NAEBVMobEffectInstance\@\@\@Z */ virtual bool canBeAffectedByArrow(class MobEffectInstance const &) const; /** - * @vftbl 209 + * @vftbl 207 * @symbol ?onEffectAdded\@Actor\@\@UEAAXAEAVMobEffectInstance\@\@\@Z */ virtual void onEffectAdded(class MobEffectInstance &); /** - * @vftbl 210 + * @vftbl 208 * @symbol ?onEffectUpdated\@Actor\@\@UEAAXAEAVMobEffectInstance\@\@\@Z */ virtual void onEffectUpdated(class MobEffectInstance &); /** - * @vftbl 211 + * @vftbl 209 * @symbol ?onEffectRemoved\@Actor\@\@UEAAXAEAVMobEffectInstance\@\@\@Z */ virtual void onEffectRemoved(class MobEffectInstance &); /** - * @vftbl 212 + * @vftbl 210 * @symbol ?canObstructSpawningAndBlockPlacement\@Actor\@\@UEBA_NXZ */ virtual bool canObstructSpawningAndBlockPlacement() const; /** - * @vftbl 213 + * @vftbl 211 * @symbol ?getAnimationComponent\@Actor\@\@UEAAAEAVAnimationComponent\@\@XZ */ virtual class AnimationComponent & getAnimationComponent(); /** - * @vftbl 214 + * @vftbl 212 * @symbol ?openContainerComponent\@Actor\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void openContainerComponent(class Player &); /** - * @vftbl 215 + * @vftbl 213 * @symbol ?swing\@Actor\@\@UEAAXXZ */ virtual void swing(); /** - * @vftbl 216 + * @vftbl 214 * @symbol ?useItem\@Actor\@\@UEAAXAEAVItemStackBase\@\@W4ItemUseMethod\@\@_N\@Z */ virtual void useItem(class ItemStackBase &, enum class ItemUseMethod, bool); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 219 + * @vftbl 217 * @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 220 + * @vftbl 218 * @symbol ?getMapDecorationRotation\@Actor\@\@UEBAMXZ */ virtual float getMapDecorationRotation() const; /** - * @vftbl 221 + * @vftbl 219 * @symbol ?getPassengerYRotation\@Actor\@\@UEBAMAEBV1\@\@Z */ virtual float getPassengerYRotation(class Actor const &) const; /** - * @vftbl 222 - * @symbol ?isWorldBuilder\@Actor\@\@UEBA_NXZ - */ - virtual bool isWorldBuilder() const; - /** - * @vftbl 223 - * @symbol ?isCreative\@Actor\@\@UEBA_NXZ - */ - virtual bool isCreative() const; - /** - * @vftbl 224 - * @symbol ?isAdventure\@Actor\@\@UEBA_NXZ - */ - virtual bool isAdventure() const; - /** - * @vftbl 225 - * @symbol ?isSurvival\@Actor\@\@UEBA_NXZ - */ - virtual bool isSurvival() const; - /** - * @vftbl 226 - * @symbol ?isSpectator\@Actor\@\@UEBA_NXZ - */ - virtual bool isSpectator() const; - /** - * @vftbl 227 - * @symbol ?isAttackableGamemode\@Actor\@\@UEBA_NXZ - */ - virtual bool isAttackableGamemode() const; - /** - * @vftbl 228 + * @vftbl 220 * @symbol ?add\@Actor\@\@UEAA_NAEAVItemStack\@\@\@Z */ virtual bool add(class ItemStack &); /** - * @vftbl 229 + * @vftbl 221 * @symbol ?drop\@Actor\@\@UEAA_NAEBVItemStack\@\@_N\@Z */ virtual bool drop(class ItemStack const &, bool); /** - * @vftbl 230 + * @vftbl 222 * @symbol ?getInteraction\@Actor\@\@UEAA_NAEAVPlayer\@\@AEAVActorInteraction\@\@AEBVVec3\@\@\@Z */ virtual bool getInteraction(class Player &, class ActorInteraction &, class Vec3 const &); /** - * @vftbl 231 + * @vftbl 223 * @symbol ?canDestroyBlock\@Actor\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool canDestroyBlock(class Block const &) const; /** - * @vftbl 232 + * @vftbl 224 * @symbol ?setAuxValue\@Actor\@\@UEAAXH\@Z */ virtual void setAuxValue(int); /** - * @vftbl 233 + * @vftbl 225 * @symbol ?setSize\@Actor\@\@UEAAXMM\@Z */ virtual void setSize(float, float); /** - * @vftbl 234 + * @vftbl 226 * @symbol ?onOrphan\@Actor\@\@UEAAXXZ */ virtual void onOrphan(); /** - * @vftbl 235 + * @vftbl 227 * @symbol ?wobble\@Actor\@\@UEAAXXZ */ virtual void wobble(); /** - * @vftbl 236 + * @vftbl 228 * @symbol ?wasHurt\@Actor\@\@UEAA_NXZ */ virtual bool wasHurt(); /** - * @vftbl 237 + * @vftbl 229 * @symbol ?startSpinAttack\@Actor\@\@UEAAXXZ */ virtual void startSpinAttack(); /** - * @vftbl 238 + * @vftbl 230 * @symbol ?stopSpinAttack\@Actor\@\@UEAAXXZ */ virtual void stopSpinAttack(); /** - * @vftbl 239 + * @vftbl 231 * @symbol ?setDamageNearbyMobs\@Actor\@\@UEAAX_N\@Z */ virtual void setDamageNearbyMobs(bool); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 241 + * @vftbl 233 * @symbol ?reloadLootTable\@Actor\@\@UEAAXXZ */ virtual void reloadLootTable(); /** - * @vftbl 242 + * @vftbl 234 * @symbol ?reloadLootTable\@Actor\@\@UEAAXAEBUEquipmentTableDefinition\@\@\@Z */ virtual void reloadLootTable(struct EquipmentTableDefinition const &); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 244 + * @vftbl 236 * @symbol ?kill\@Actor\@\@UEAAXXZ */ virtual void kill(); /** - * @vftbl 245 + * @vftbl 237 * @symbol ?die\@Actor\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 246 + * @vftbl 238 * @symbol ?shouldDropDeathLoot\@Actor\@\@UEBA_NXZ */ virtual bool shouldDropDeathLoot() const; /** - * @vftbl 247 + * @vftbl 239 * @symbol ?shouldTick\@Actor\@\@UEBA_NXZ */ virtual bool shouldTick() const; /** - * @vftbl 248 + * @vftbl 240 * @symbol ?applySnapshot\@Actor\@\@UEAAXAEBVEntityContext\@\@0\@Z */ virtual void applySnapshot(class EntityContext const &, class EntityContext const &); /** - * @vftbl 249 + * @vftbl 241 * @symbol ?getNextStep\@Actor\@\@UEAAMM\@Z */ virtual float getNextStep(float); /** - * @vftbl 250 + * @vftbl 242 * @symbol ?getLootTable\@Actor\@\@UEAAPEAVLootTable\@\@XZ */ virtual class LootTable * getLootTable(); /** - * @vftbl 251 + * @vftbl 243 * @symbol ?onPush\@Actor\@\@UEAAXAEAV1\@\@Z */ virtual void onPush(class Actor &); /** - * @vftbl 252 + * @vftbl 244 * @symbol ?getLastDeathPos\@Actor\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@XZ */ virtual class std::optional getLastDeathPos() const; /** - * @vftbl 253 + * @vftbl 245 * @symbol ?getLastDeathDimension\@Actor\@\@UEBA?AV?$optional\@V?$AutomaticID\@VDimension\@\@H\@\@\@std\@\@XZ */ virtual class std::optional> getLastDeathDimension() const; /** - * @vftbl 254 + * @vftbl 246 * @symbol ?hasDiedBefore\@Actor\@\@UEBA_NXZ */ virtual bool hasDiedBefore() const; /** - * @vftbl 255 + * @vftbl 247 * @symbol ?doWaterSplashEffect\@Actor\@\@UEAAXXZ */ virtual void doWaterSplashEffect(); /** - * @vftbl 256 + * @vftbl 248 * @symbol ?_shouldProvideFeedbackOnHandContainerItemSet\@Actor\@\@MEBA_NW4HandSlot\@\@AEBVItemStack\@\@\@Z */ virtual bool _shouldProvideFeedbackOnHandContainerItemSet(enum class HandSlot, class ItemStack const &) const; /** - * @vftbl 257 + * @vftbl 249 * @symbol ?_shouldProvideFeedbackOnArmorSet\@Actor\@\@MEBA_NW4ArmorSlot\@\@AEBVItemStack\@\@\@Z */ virtual bool _shouldProvideFeedbackOnArmorSet(enum class ArmorSlot, class ItemStack const &) const; /** - * @vftbl 258 + * @vftbl 250 * @symbol ?updateEntitySpecificMolangVariables\@Actor\@\@MEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 259 + * @vftbl 251 * @symbol ?shouldTryMakeStepSound\@Actor\@\@MEAA_NXZ */ virtual bool shouldTryMakeStepSound(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@Actor\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 262 + * @vftbl 254 * @symbol ?markHurt\@Actor\@\@MEAAXXZ */ virtual void markHurt(); /** - * @vftbl 263 + * @vftbl 255 * @symbol ?_getAnimationComponent\@Actor\@\@MEAAAEAVAnimationComponent\@\@AEAV?$shared_ptr\@VAnimationComponent\@\@\@std\@\@W4AnimationComponentGroupType\@\@\@Z */ virtual class AnimationComponent & _getAnimationComponent(class std::shared_ptr &, enum class AnimationComponentGroupType); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@Actor\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@Actor\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 266 + * @vftbl 258 * @symbol ?_playStepSound\@Actor\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 267 + * @vftbl 259 * @symbol ?_playFlySound\@Actor\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playFlySound(class BlockPos const &, class Block const &); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 269 + * @vftbl 261 * @symbol ?checkInsideBlocks\@Actor\@\@MEAAXM\@Z */ virtual void checkInsideBlocks(float); /** - * @vftbl 270 + * @vftbl 262 * @symbol ?pushOutOfBlocks\@Actor\@\@MEAAXAEBVVec3\@\@\@Z */ virtual void pushOutOfBlocks(class Vec3 const &); /** - * @vftbl 271 + * @vftbl 263 * @symbol ?spawnTrailBubbles\@Actor\@\@MEAAXXZ */ virtual void spawnTrailBubbles(); /** - * @vftbl 272 + * @vftbl 264 * @symbol ?updateInsideBlock\@Actor\@\@MEAAXXZ */ virtual void updateInsideBlock(); /** - * @vftbl 273 + * @vftbl 265 * @symbol ?_removePassenger\@Actor\@\@MEAAXAEBUActorUniqueID\@\@_N11\@Z */ virtual void _removePassenger(struct ActorUniqueID const &, bool, bool, bool); /** - * @vftbl 274 + * @vftbl 266 * @symbol ?_onSizeUpdated\@Actor\@\@EEAAXXZ */ virtual void _onSizeUpdated(); @@ -1503,10 +1462,6 @@ class Actor { * @symbol ?canExistInPeaceful\@Actor\@\@UEBA_NXZ */ MCVAPI bool canExistInPeaceful() const; - /** - * @symbol ?canInteractWithOtherEntitiesInGame\@Actor\@\@UEBA_NXZ - */ - MCVAPI bool canInteractWithOtherEntitiesInGame() const; /** * @symbol ?canMakeStepSound\@Actor\@\@MEBA_NXZ */ @@ -1593,9 +1548,9 @@ class Actor { */ MCAPI void _setActorTypeId(enum class ActorType); /** - * @symbol ?_setLevelPtr\@Actor\@\@QEAAXPEAVLevel\@\@\@Z + * @symbol ?_setLevelPtr\@Actor\@\@QEAAXPEAVILevel\@\@\@Z */ - MCAPI void _setLevelPtr(class Level *); + MCAPI void _setLevelPtr(class ILevel *); /** * @symbol ?addCategory\@Actor\@\@QEAAXAEBW4ActorCategory\@\@\@Z */ @@ -1684,14 +1639,14 @@ class Actor { * @symbol ?clearFishingHookID\@Actor\@\@QEAAXXZ */ MCAPI void clearFishingHookID(); - /** - * @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 ?closerThan\@Actor\@\@QEBA_NAEBV1\@M\@Z + */ + MCAPI bool closerThan(class Actor const &, float) const; /** * @symbol ?consumeItem\@Actor\@\@QEAAXAEAVItemActor\@\@H\@Z */ @@ -1749,9 +1704,9 @@ class Actor { */ MCAPI bool executeEvent(std::string const &, class VariantParameterList const &); /** - * @symbol ?exitVehicle\@Actor\@\@QEAAXAEBV1\@P6A?AV?$optional\@VVec3\@\@\@std\@\@AEBUVehicleDirections\@VehicleUtils\@\@V?$function\@$$A6A_NAEBVVec3\@\@0\@Z\@3\@\@Z\@Z + * @symbol ?exitVehicle\@Actor\@\@QEAAX_N00\@Z */ - MCAPI void exitVehicle(class Actor const &, class std::optional ( *)(struct VehicleUtils::VehicleDirections const &, class std::function)); + MCAPI void exitVehicle(bool, bool, bool); /** * @symbol ?fetchFishingHook\@Actor\@\@QEAAPEAVFishingHook\@\@XZ */ @@ -1877,25 +1832,21 @@ class Actor { */ MCAPI class AutomaticID getDimensionId() const; /** - * @symbol ?getEconomyTradeableComponent\@Actor\@\@QEBAPEAVEconomyTradeableComponent\@\@XZ + * @symbol ?getEffect\@Actor\@\@QEBAPEBVMobEffectInstance\@\@I\@Z */ - MCAPI class EconomyTradeableComponent * getEconomyTradeableComponent() const; + 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 + * @symbol ?getEntityData\@Actor\@\@QEBAAEBVSynchedActorDataEntityWrapper\@\@XZ */ - MCAPI class MobEffectInstance const * getEffect(unsigned int) const; + MCAPI class SynchedActorDataEntityWrapper const & getEntityData() const; /** * @symbol ?getEntityData\@Actor\@\@QEAAAEAVSynchedActorDataEntityWrapper\@\@XZ */ MCAPI class SynchedActorDataEntityWrapper & getEntityData(); - /** - * @symbol ?getEntityData\@Actor\@\@QEBAAEBVSynchedActorDataEntityWrapper\@\@XZ - */ - MCAPI class SynchedActorDataEntityWrapper const & getEntityData() const; /** * @symbol ?getEntityRegistry\@Actor\@\@QEAA?AV?$StackRefResultT\@UEntityRegistryRefTraits\@\@\@\@XZ */ @@ -1920,14 +1871,14 @@ class Actor { * @symbol ?getFirstPassenger\@Actor\@\@QEBAPEAV1\@XZ */ MCAPI class Actor * getFirstPassenger() const; - /** - * @symbol ?getHandContainer\@Actor\@\@QEAAAEAVSimpleContainer\@\@XZ - */ - MCAPI class SimpleContainer & getHandContainer(); /** * @symbol ?getHandContainer\@Actor\@\@QEBAAEBVSimpleContainer\@\@XZ */ MCAPI class SimpleContainer const & getHandContainer() const; + /** + * @symbol ?getHandContainer\@Actor\@\@QEAAAEAVSimpleContainer\@\@XZ + */ + MCAPI class SimpleContainer & getHandContainer(); /** * @symbol ?getHealth\@Actor\@\@QEBAHXZ */ @@ -1988,14 +1939,14 @@ class Actor { * @symbol ?getLeashHolder\@Actor\@\@QEBA?AUActorUniqueID\@\@XZ */ MCAPI struct ActorUniqueID getLeashHolder() const; - /** - * @symbol ?getLevel\@Actor\@\@QEAAAEAVLevel\@\@XZ - */ - MCAPI class Level & getLevel(); /** * @symbol ?getLevel\@Actor\@\@QEBAAEBVLevel\@\@XZ */ MCAPI class Level const & getLevel() const; + /** + * @symbol ?getLevel\@Actor\@\@QEAAAEAVLevel\@\@XZ + */ + MCAPI class Level & getLevel(); /** * @symbol ?getLevelTimeStamp\@Actor\@\@QEBA_KXZ */ @@ -2024,14 +1975,14 @@ class Actor { * @symbol ?getMolangVariables\@Actor\@\@QEAAAEAVMolangVariableMap\@\@XZ */ MCAPI class MolangVariableMap & getMolangVariables(); - /** - * @symbol ?getMovementProxy\@Actor\@\@QEAA?AV?$not_null\@V?$shared_ptr\@UIActorMovementProxy\@\@\@std\@\@\@gsl\@\@XZ - */ - MCAPI class gsl::not_null> getMovementProxy(); /** * @symbol ?getMovementProxy\@Actor\@\@QEBA?AV?$not_null\@V?$shared_ptr\@$$CBUIActorMovementProxy\@\@\@std\@\@\@gsl\@\@XZ */ MCAPI class gsl::not_null> getMovementProxy() const; + /** + * @symbol ?getMovementProxy\@Actor\@\@QEAA?AV?$not_null\@V?$shared_ptr\@UIActorMovementProxy\@\@\@std\@\@\@gsl\@\@XZ + */ + MCAPI class gsl::not_null> getMovementProxy(); /** * @symbol ?getOffhandSlot\@Actor\@\@QEBAAEBVItemStack\@\@XZ */ @@ -2120,14 +2071,14 @@ class Actor { * @symbol ?getSlideOffset\@Actor\@\@QEBA?AVVec2\@\@XZ */ MCAPI class Vec2 getSlideOffset() const; - /** - * @symbol ?getSpatialNetworkData\@Actor\@\@QEBAAEBVSpatialActorNetworkData\@\@XZ - */ - MCAPI class SpatialActorNetworkData const & getSpatialNetworkData() const; /** * @symbol ?getSpatialNetworkData\@Actor\@\@QEAAAEAVSpatialActorNetworkData\@\@XZ */ MCAPI class SpatialActorNetworkData & getSpatialNetworkData(); + /** + * @symbol ?getSpatialNetworkData\@Actor\@\@QEBAAEBVSpatialActorNetworkData\@\@XZ + */ + MCAPI class SpatialActorNetworkData const & getSpatialNetworkData() const; /** * @symbol ?getSpeedInMetersPerSecond\@Actor\@\@QEBAMXZ */ @@ -2316,22 +2267,30 @@ class Actor { * @symbol ?initActorProperties\@Actor\@\@QEAAXXZ */ MCAPI void initActorProperties(); - /** - * @symbol ?initParams\@Actor\@\@QEAAXAEAVRenderParams\@\@\@Z - */ - MCAPI void initParams(class RenderParams &); /** * @symbol ?initParams\@Actor\@\@QEAAXAEAVVariantParameterList\@\@\@Z */ MCAPI void initParams(class VariantParameterList &); + /** + * @symbol ?initParams\@Actor\@\@QEAAXAEAVRenderParams\@\@\@Z + */ + MCAPI void initParams(class RenderParams &); /** * @symbol ?isActorLocationInMaterial\@Actor\@\@QEBA_NW4ActorLocation\@\@W4MaterialType\@\@\@Z */ MCAPI bool isActorLocationInMaterial(enum class ActorLocation, enum class MaterialType) const; + /** + * @symbol ?isAdventure\@Actor\@\@QEBA_NXZ + */ + MCAPI bool isAdventure() const; /** * @symbol ?isAngry\@Actor\@\@QEBA_NXZ */ MCAPI bool isAngry() const; + /** + * @symbol ?isAttackableGamemode\@Actor\@\@QEBA_NXZ + */ + MCAPI bool isAttackableGamemode() const; /** * @symbol ?isAutonomous\@Actor\@\@QEBA_NXZ */ @@ -2364,6 +2323,10 @@ class Actor { * @symbol ?isControlledByLocalInstance\@Actor\@\@QEBA_NXZ */ MCAPI bool isControlledByLocalInstance() const; + /** + * @symbol ?isCreative\@Actor\@\@QEBA_NXZ + */ + MCAPI bool isCreative() const; /** * @symbol ?isDancing\@Actor\@\@QEBA_NXZ */ @@ -2400,10 +2363,6 @@ class Actor { * @symbol ?isInContactWithWater\@Actor\@\@QEBA_NXZ */ MCAPI bool isInContactWithWater() const; - /** - * @symbol ?isInLava\@Actor\@\@QEBA_NXZ - */ - MCAPI bool isInLava() const; /** * @symbol ?isInLove\@Actor\@\@QEBA_NXZ */ @@ -2532,6 +2491,10 @@ class Actor { * @symbol ?isSneaking\@Actor\@\@QEBA_NXZ */ MCAPI bool isSneaking() const; + /** + * @symbol ?isSpectator\@Actor\@\@QEBA_NXZ + */ + MCAPI bool isSpectator() const; /** * @symbol ?isStackable\@Actor\@\@QEBA_NXZ */ @@ -2540,6 +2503,10 @@ class Actor { * @symbol ?isStanding\@Actor\@\@QEBA_NXZ */ MCAPI bool isStanding() const; + /** + * @symbol ?isSurvival\@Actor\@\@QEBA_NXZ + */ + MCAPI bool isSurvival() const; /** * @symbol ?isSwimmer\@Actor\@\@QEBA_NXZ */ @@ -2585,17 +2552,17 @@ class Actor { */ MCAPI bool isWalker() const; /** - * @symbol ?lerpTo\@Actor\@\@QEAAXAEBVVec3\@\@AEBVVec2\@\@H\@Z + * @symbol ?isWorldBuilder\@Actor\@\@QEBA_NXZ */ - MCAPI void lerpTo(class Vec3 const &, class Vec2 const &, int); + MCAPI bool isWorldBuilder() const; /** * @symbol ?lerpTo\@Actor\@\@QEAAXAEBVVec3\@\@AEBVVec2\@\@MH\@Z */ MCAPI void lerpTo(class Vec3 const &, class Vec2 const &, float, int); /** - * @symbol ?lerpToRotation\@Actor\@\@QEAAXAEBVVec2\@\@H\@Z + * @symbol ?lerpTo\@Actor\@\@QEAAXAEBVVec3\@\@AEBVVec2\@\@H\@Z */ - MCAPI void lerpToRotation(class Vec2 const &, int); + MCAPI void lerpTo(class Vec3 const &, class Vec2 const &, int); /** * @symbol ?loadEntityFlags\@Actor\@\@QEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ @@ -2628,10 +2595,6 @@ class Actor { * @symbol ?onClimbableBlock\@Actor\@\@QEBA_NXZ */ MCAPI bool onClimbableBlock() const; - /** - * @symbol ?onHoverableBlock\@Actor\@\@QEBA_NXZ - */ - MCAPI bool onHoverableBlock() const; /** * @symbol ?onOnewayCollision\@Actor\@\@QEAAXAEBVAABB\@\@\@Z */ @@ -2908,6 +2871,10 @@ class Actor { * @symbol ?setPersistent\@Actor\@\@QEAAXXZ */ MCAPI void setPersistent(); + /** + * @symbol ?setPos\@Actor\@\@QEAAXAEBVVec3\@\@\@Z + */ + MCAPI void setPos(class Vec3 const &); /** * @symbol ?setPosDirectLegacy\@Actor\@\@QEAAXAEBVVec3\@\@\@Z */ @@ -2921,9 +2888,9 @@ class Actor { */ MCAPI void setPrevPosRotSetThisTick(bool); /** - * @symbol ?setPreviousPosRot\@Actor\@\@QEAAXAEBVVec3\@\@AEBVVec2\@\@\@Z + * @symbol ?setPreviousPosRot\@Actor\@\@QEAAXXZ */ - MCAPI void setPreviousPosRot(class Vec3 const &, class Vec2 const &); + MCAPI void setPreviousPosRot(); /** * @symbol ?setResting\@Actor\@\@QEAAX_N\@Z */ @@ -3096,6 +3063,10 @@ class Actor { * @symbol ?updateDescription\@Actor\@\@QEAAXXZ */ MCAPI void updateDescription(); + /** + * @symbol ?updateDimensionChunkMove\@Actor\@\@QEAAXXZ + */ + MCAPI void updateDimensionChunkMove(); /** * @symbol ?updateInvisibilityStatus\@Actor\@\@QEAAXXZ */ @@ -3136,14 +3107,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\@\@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 ?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 ?getCenter\@Actor\@\@SA?AVVec3\@\@MAEBUAABBShapeComponent\@\@AEBUStateVectorComponent\@\@M\@Z */ @@ -3192,10 +3163,6 @@ class Actor { * @symbol ?isImmobile\@Actor\@\@SA_NAEBUIActorMovementProxy\@\@\@Z */ MCAPI static bool isImmobile(struct IActorMovementProxy const &); - /** - * @symbol ?isInLava\@Actor\@\@SA_NAEBUIActorMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z - */ - MCAPI static bool isInLava(struct IActorMovementProxy const &, class IConstBlockSource const &); /** * @symbol ?isInScaffolding\@Actor\@\@SA_NAEBUIActorMovementProxy\@\@\@Z */ @@ -3270,10 +3237,6 @@ class Actor { * @symbol ?_isHeadInWater\@Actor\@\@IEBA_NXZ */ MCAPI bool _isHeadInWater() const; - /** - * @symbol ?_refreshAABB\@Actor\@\@IEAAXXZ - */ - MCAPI void _refreshAABB(); /** * @symbol ?_setArmorContainer\@Actor\@\@IEAAXV?$unique_ptr\@VSimpleContainer\@\@U?$default_delete\@VSimpleContainer\@\@\@std\@\@\@std\@\@\@Z */ @@ -3368,10 +3331,6 @@ class Actor { * @symbol ?_updateComposition\@Actor\@\@AEAAX_N\@Z */ MCAPI void _updateComposition(bool); - /** - * @symbol ?_updateOwnerChunk\@Actor\@\@AEAAXXZ - */ - MCAPI void _updateOwnerChunk(); /** * @symbol ?_containsSneakCollisionShapes\@Actor\@\@CA_NAEAUIActorMovementProxy\@\@AEBVIConstBlockSource\@\@AEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorAnimationEvent.hpp b/LiteLoader/include/llapi/mc/ActorAnimationEvent.hpp index 007e036d13..2377178b35 100644 --- a/LiteLoader/include/llapi/mc/ActorAnimationEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActorAnimationEvent.hpp @@ -29,14 +29,14 @@ class ActorAnimationEvent { #endif public: - /** - * @symbol ??0ActorAnimationEvent\@\@QEAA\@MAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CurrentCmdVersion\@\@W4MolangVersion\@\@\@Z - */ - MCAPI ActorAnimationEvent(float, std::string const &, enum class CurrentCmdVersion, enum class MolangVersion); /** * @symbol ??0ActorAnimationEvent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI ActorAnimationEvent(class ActorAnimationEvent &&); + /** + * @symbol ??0ActorAnimationEvent\@\@QEAA\@MAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CurrentCmdVersion\@\@W4MolangVersion\@\@\@Z + */ + MCAPI ActorAnimationEvent(float, std::string const &, enum class CurrentCmdVersion, enum class MolangVersion); /** * @symbol ?fire\@ActorAnimationEvent\@\@QEBAXAEAVRenderParams\@\@PEAVActor\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorBlock.hpp b/LiteLoader/include/llapi/mc/ActorBlock.hpp index 43901daf59..bfb2d4f621 100644 --- a/LiteLoader/include/llapi/mc/ActorBlock.hpp +++ b/LiteLoader/include/llapi/mc/ActorBlock.hpp @@ -40,16 +40,21 @@ class ActorBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class ActorBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class ActorBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,127 +131,122 @@ class ActorBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@ActorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 101 + * @vftbl 100 * @symbol ?playerWillDestroy\@ActorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 102 + * @vftbl 101 * @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 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 116 + * @vftbl 115 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 195 + * @vftbl 194 * @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 a8bf5d4630..409687af91 100644 --- a/LiteLoader/include/llapi/mc/ActorContainerDiffHelperImpl.hpp +++ b/LiteLoader/include/llapi/mc/ActorContainerDiffHelperImpl.hpp @@ -25,6 +25,10 @@ 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 */ @@ -33,14 +37,6 @@ 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?BV?$vector\@V?$not_null\@PEBVMobEffectInstance\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEBVMobEffectInstance\@\@\@gsl\@\@\@std\@\@\@std\@\@AEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@3\@0\@Z - */ - MCAPI std::vector> const _getDiff(std::vector const &, 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 */ @@ -49,5 +45,9 @@ namespace ActorContainerDiffHelperImpl { * @symbol ?_getDiff\@ActorContainerDiffHelperImpl\@\@YA?BV?$vector\@V?$not_null\@PEBVAttributeInstance\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEBVAttributeInstance\@\@\@gsl\@\@\@std\@\@\@std\@\@AEBVBaseAttributeMap\@\@0\@Z */ MCAPI std::vector> const _getDiff(class BaseAttributeMap const &, class BaseAttributeMap const &); + /** + * @symbol ?_getDiff\@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\@0\@Z + */ + MCAPI std::vector> const _getDiff(std::vector const &, std::vector const &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorDefinition.hpp b/LiteLoader/include/llapi/mc/ActorDefinition.hpp index c40a1af57b..354c90cbeb 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinition.hpp @@ -35,9 +35,9 @@ class ActorDefinition { */ MCAPI ActorDefinition(std::string const &); /** - * @symbol ?parse\@ActorDefinition\@\@QEAAXUDeserializeDataParams\@\@AEAVActorDefinitionDescriptor\@\@AEAVActorFactory\@\@W4LogArea\@\@\@Z + * @symbol ?parse\@ActorDefinition\@\@QEAA?AW4ActorDefinitionParseStatus\@\@UDeserializeDataParams\@\@AEAVActorDefinitionDescriptor\@\@AEAVActorFactory\@\@W4LogArea\@\@\@Z */ - MCAPI void parse(struct DeserializeDataParams, class ActorDefinitionDescriptor &, class ActorFactory &, enum class LogArea); + MCAPI enum class ActorDefinitionParseStatus parse(struct DeserializeDataParams, class ActorDefinitionDescriptor &, class ActorFactory &, enum class LogArea); /** * @symbol ?parseAttributes\@ActorDefinition\@\@QEAAXUDeserializeDataParams\@\@AEAVActorDefinitionDescriptor\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionGroup.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionGroup.hpp index ff81865aa8..1572e85b85 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionGroup.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionGroup.hpp @@ -82,17 +82,17 @@ struct LoadActorResult { */ MCAPI void _getResources(class Level &); /** - * @symbol ?_loadActorDefinition\@ActorDefinitionGroup\@\@AEAA?AULoadActorResult\@1\@AEAVLevel\@\@AEBVSemVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBW4CurrentCmdVersion\@\@AEAVValue\@Json\@\@AEAV?$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\@\@6\@W4LogArea\@\@\@Z + * @symbol ?_loadActorDefinition\@ActorDefinitionGroup\@\@AEAA?AULoadActorResult\@1\@AEAVLevel\@\@AEBVSemVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBW4CurrentCmdVersion\@\@AEAVValue\@Json\@\@AEAV?$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\@\@6\@_NW4LogArea\@\@\@Z */ - MCAPI struct ActorDefinitionGroup::LoadActorResult _loadActorDefinition(class Level &, class SemVersion const &, std::string const &, enum class CurrentCmdVersion const &, class Json::Value &, class std::unordered_set, struct std::equal_to, class std::allocator> &, enum class LogArea); + MCAPI struct ActorDefinitionGroup::LoadActorResult _loadActorDefinition(class Level &, class SemVersion const &, std::string const &, enum class CurrentCmdVersion const &, class Json::Value &, class std::unordered_set, struct std::equal_to, class std::allocator> &, bool, enum class LogArea); /** - * @symbol ?_loadDefinitionFromJSON\@ActorDefinitionGroup\@\@AEAA_NAEBVSemVersion\@\@0AEBW4CurrentCmdVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVValue\@Json\@\@2AEAVLevel\@\@W4LogArea\@\@\@Z + * @symbol ?_loadDefinitionFromJSON\@ActorDefinitionGroup\@\@AEAA_NAEBVSemVersion\@\@0AEBW4CurrentCmdVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVValue\@Json\@\@2AEAVLevel\@\@_NW4LogArea\@\@\@Z */ - MCAPI bool _loadDefinitionFromJSON(class SemVersion const &, class SemVersion const &, enum class CurrentCmdVersion const &, std::string const &, class Json::Value &, std::string const &, class Level &, enum class LogArea); + MCAPI bool _loadDefinitionFromJSON(class SemVersion const &, class SemVersion const &, enum class CurrentCmdVersion const &, std::string const &, class Json::Value &, std::string const &, class Level &, bool, enum class LogArea); /** - * @symbol ?_loadTemplates\@ActorDefinitionGroup\@\@AEAAXAEAVLevel\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UDeserializeDataParams\@\@\@Z + * @symbol ?_loadTemplates\@ActorDefinitionGroup\@\@AEAA?AW4ActorDefinitionParseStatus\@\@AEAVLevel\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UDeserializeDataParams\@\@\@Z */ - MCAPI void _loadTemplates(class Level &, std::string const &, struct DeserializeDataParams); + MCAPI enum class ActorDefinitionParseStatus _loadTemplates(class Level &, std::string const &, struct DeserializeDataParams); /** * @symbol ?_setupCommonResourceDefinitionMap\@ActorDefinitionGroup\@\@AEAAXAEAVActorDefinition\@\@AEAVLevel\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionIdentifier.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionIdentifier.hpp index 52a5514f0f..f6f70d0422 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionIdentifier.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionIdentifier.hpp @@ -33,29 +33,29 @@ struct ActorDefinitionIdentifier { */ MCAPI ActorDefinitionIdentifier(enum class ActorType); /** - * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@XZ + * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@AEBU0\@\@Z */ - MCAPI ActorDefinitionIdentifier(); + MCAPI ActorDefinitionIdentifier(struct ActorDefinitionIdentifier const &); /** - * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@PEBD\@Z + * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@XZ */ - MCAPI ActorDefinitionIdentifier(char const *); + MCAPI ActorDefinitionIdentifier(); /** - * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@$$QEAU0\@\@Z */ - MCAPI ActorDefinitionIdentifier(struct ActorDefinitionIdentifier const &); + MCAPI ActorDefinitionIdentifier(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\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@PEBD\@Z */ - MCAPI ActorDefinitionIdentifier(std::string const &); + MCAPI ActorDefinitionIdentifier(char const *); /** - * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI ActorDefinitionIdentifier(struct ActorDefinitionIdentifier &&); + MCAPI ActorDefinitionIdentifier(std::string const &); /** * @symbol ?_getLegacyActorType\@ActorDefinitionIdentifier\@\@QEBA?AW4ActorType\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionModifier.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionModifier.hpp index 8ee081ca9a..09bfbe81ad 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionModifier.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionModifier.hpp @@ -29,14 +29,14 @@ struct ActorDefinitionModifier { * @symbol ??0ActorDefinitionModifier\@\@QEAA\@AEBU0\@\@Z */ MCAPI ActorDefinitionModifier(struct ActorDefinitionModifier const &); - /** - * @symbol ??4ActorDefinitionModifier\@\@QEAAAEAU0\@AEBU0\@\@Z - */ - MCAPI struct ActorDefinitionModifier & operator=(struct ActorDefinitionModifier const &); /** * @symbol ??4ActorDefinitionModifier\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct ActorDefinitionModifier & operator=(struct ActorDefinitionModifier &&); + /** + * @symbol ??4ActorDefinitionModifier\@\@QEAAAEAU0\@AEBU0\@\@Z + */ + MCAPI struct ActorDefinitionModifier & operator=(struct ActorDefinitionModifier const &); /** * @symbol ??1ActorDefinitionModifier\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ActorEventCoordinator.hpp b/LiteLoader/include/llapi/mc/ActorEventCoordinator.hpp index 94627cfb48..4128fa238b 100644 --- a/LiteLoader/include/llapi/mc/ActorEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/ActorEventCoordinator.hpp @@ -78,20 +78,16 @@ class ActorEventCoordinator { */ MCAPI void sendActorTick(class Actor &); /** - * @symbol ?sendActorUseItemOn\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@AEBVItemStack\@\@AEBVBlockPos\@\@E\@Z - */ - MCAPI void sendActorUseItemOn(class Actor &, class ItemStack const &, class BlockPos const &, unsigned char); - /** - * @symbol ?sendEvent\@ActorEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@AEBV?$EventRef\@U?$ActorGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z + * @symbol ?sendEvent\@ActorEventCoordinator\@\@QEAAXAEBV?$EventRef\@U?$ActorGameplayEvent\@X\@\@\@\@\@Z */ - MCAPI enum class CoordinatorResult sendEvent(class EventRef> const &); + 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 + * @symbol ?sendEvent\@ActorEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@AEBV?$EventRef\@U?$ActorGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z */ - MCAPI void sendEvent(class EventRef> const &); + MCAPI enum class CoordinatorResult sendEvent(class EventRef> const &); }; diff --git a/LiteLoader/include/llapi/mc/ActorEventListener.hpp b/LiteLoader/include/llapi/mc/ActorEventListener.hpp index 4d3dbccdc0..5e1c22896f 100644 --- a/LiteLoader/include/llapi/mc/ActorEventListener.hpp +++ b/LiteLoader/include/llapi/mc/ActorEventListener.hpp @@ -82,10 +82,6 @@ class ActorEventListener { * @symbol ?onActorTick\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@\@Z */ MCVAPI enum class EventResult onActorTick(class Actor &); - /** - * @symbol ?onActorUseItemOn\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@AEBVItemStack\@\@AEBVBlockPos\@\@E\@Z - */ - MCVAPI enum class EventResult onActorUseItemOn(class Actor &, class ItemStack const &, class BlockPos const &, unsigned char); /** * @symbol ?onEvent\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEBUActorNotificationEvent\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorEventPacket.hpp b/LiteLoader/include/llapi/mc/ActorEventPacket.hpp index 59e9107f6e..b1a5afdb4f 100644 --- a/LiteLoader/include/llapi/mc/ActorEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/ActorEventPacket.hpp @@ -54,9 +54,9 @@ class ActorEventPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ActorEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ActorEventPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 1811c233d7..2e582353c3 100644 --- a/LiteLoader/include/llapi/mc/ActorFactory.hpp +++ b/LiteLoader/include/llapi/mc/ActorFactory.hpp @@ -102,6 +102,10 @@ class ActorFactory { * @symbol ?clearEntityMappings\@ActorFactory\@\@SAXXZ */ MCAPI static void clearEntityMappings(); + /** + * @symbol ?fillFactoryData\@ActorFactory\@\@SAXAEBUActorDefinitionIdentifier\@\@0AEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorFactoryData\@\@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\@\@UActorFactoryData\@\@\@std\@\@\@2\@\@std\@\@AEAUActorFactoryData\@\@\@Z + */ + MCAPI static void fillFactoryData(struct ActorDefinitionIdentifier const &, struct ActorDefinitionIdentifier const &, class std::unordered_map, struct std::equal_to, class std::allocator>> const &, struct ActorFactoryData &); /** * @symbol ?fixLegacyEntity\@ActorFactory\@\@SAPEAVActor\@\@AEAVBlockSource\@\@PEBVCompoundTag\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorHasAbilityTest.hpp b/LiteLoader/include/llapi/mc/ActorHasAbilityTest.hpp index 401808d00a..959dbc4a2c 100644 --- a/LiteLoader/include/llapi/mc/ActorHasAbilityTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorHasAbilityTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorHasAbilityTest. * */ -class ActorHasAbilityTest { +class ActorHasAbilityTest : public FilterTest { #define AFTER_EXTRA // Add Member There @@ -36,36 +36,16 @@ class ActorHasAbilityTest { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?setup\@SimpleIntFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z - */ - virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** * @vftbl 2 * @symbol ?evaluate\@ActorHasAbilityTest\@\@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\@ActorHasAbilityTest\@\@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\@SimpleIntFilterTest\@\@MEBA?AVValue\@Json\@\@XZ - */ - virtual class Json::Value _serializeValue() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORHASABILITYTEST /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ActorHasAllSlotsEmptyTest.hpp b/LiteLoader/include/llapi/mc/ActorHasAllSlotsEmptyTest.hpp new file mode 100644 index 0000000000..1cffb743a8 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorHasAllSlotsEmptyTest.hpp @@ -0,0 +1,61 @@ +/** + * @file ActorHasAllSlotsEmptyTest.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "FilterTest.hpp" +#include "Json.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ActorHasAllSlotsEmptyTest : public FilterTest { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORHASALLSLOTSEMPTYTEST +public: + class ActorHasAllSlotsEmptyTest& operator=(class ActorHasAllSlotsEmptyTest const &) = delete; + ActorHasAllSlotsEmptyTest(class ActorHasAllSlotsEmptyTest const &) = delete; + ActorHasAllSlotsEmptyTest() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?setup\@ActorHasAllSlotsEmptyTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorHasAllSlotsEmptyTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + */ + virtual bool evaluate(struct FilterContext const &) const; + /** + * @vftbl 4 + * @symbol ?getName\@ActorHasAllSlotsEmptyTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ + */ + virtual class std::basic_string_view> getName() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@ActorHasAllSlotsEmptyTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORHASALLSLOTSEMPTYTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorHasAllSlotsEmptyTest(); +#endif + +}; diff --git a/LiteLoader/include/llapi/mc/ActorHasAnySlotEmptyTest.hpp b/LiteLoader/include/llapi/mc/ActorHasAnySlotEmptyTest.hpp new file mode 100644 index 0000000000..ae2f22aa8a --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorHasAnySlotEmptyTest.hpp @@ -0,0 +1,61 @@ +/** + * @file ActorHasAnySlotEmptyTest.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "FilterTest.hpp" +#include "Json.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ActorHasAnySlotEmptyTest : public FilterTest { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORHASANYSLOTEMPTYTEST +public: + class ActorHasAnySlotEmptyTest& operator=(class ActorHasAnySlotEmptyTest const &) = delete; + ActorHasAnySlotEmptyTest(class ActorHasAnySlotEmptyTest const &) = delete; + ActorHasAnySlotEmptyTest() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?setup\@ActorHasAnySlotEmptyTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorHasAnySlotEmptyTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + */ + virtual bool evaluate(struct FilterContext const &) const; + /** + * @vftbl 4 + * @symbol ?getName\@ActorHasAnySlotEmptyTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ + */ + virtual class std::basic_string_view> getName() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@ActorHasAnySlotEmptyTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORHASANYSLOTEMPTYTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorHasAnySlotEmptyTest(); +#endif + +}; diff --git a/LiteLoader/include/llapi/mc/ActorHasDamageTest.hpp b/LiteLoader/include/llapi/mc/ActorHasDamageTest.hpp index 53ee067c22..727815244d 100644 --- a/LiteLoader/include/llapi/mc/ActorHasDamageTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorHasDamageTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorHasDamageTest. * */ -class ActorHasDamageTest { +class ActorHasDamageTest : public FilterTest { #define AFTER_EXTRA // Add Member There @@ -36,36 +36,16 @@ class ActorHasDamageTest { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?setup\@SimpleIntFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z - */ - virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** * @vftbl 2 * @symbol ?evaluate\@ActorHasDamageTest\@\@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\@ActorHasDamageTest\@\@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\@SimpleIntFilterTest\@\@MEBA?AVValue\@Json\@\@XZ - */ - virtual class Json::Value _serializeValue() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORHASDAMAGETEST /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ActorHealthTest.hpp b/LiteLoader/include/llapi/mc/ActorHealthTest.hpp index b889ab901f..7ea065da21 100644 --- a/LiteLoader/include/llapi/mc/ActorHealthTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorHealthTest.hpp @@ -13,7 +13,7 @@ #undef BEFORE_EXTRA -class ActorHealthTest { +class ActorHealthTest : public FilterTest { #define AFTER_EXTRA @@ -31,35 +31,15 @@ class ActorHealthTest { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?setup\@SimpleIntFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z - */ - virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** * @vftbl 2 * @symbol ?evaluate\@ActorHealthTest\@\@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\@ActorHealthTest\@\@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\@SimpleIntFilterTest\@\@MEBA?AVValue\@Json\@\@XZ - */ - virtual class Json::Value _serializeValue() const; }; diff --git a/LiteLoader/include/llapi/mc/ActorInCloudsTest.hpp b/LiteLoader/include/llapi/mc/ActorInCloudsTest.hpp index f72dcd2281..7f747653fa 100644 --- a/LiteLoader/include/llapi/mc/ActorInCloudsTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorInCloudsTest.hpp @@ -27,7 +27,6 @@ class ActorInCloudsTest { public: class ActorInCloudsTest& operator=(class ActorInCloudsTest const &) = delete; ActorInCloudsTest(class ActorInCloudsTest const &) = delete; - ActorInCloudsTest() = delete; #endif public: @@ -72,5 +71,9 @@ class ActorInCloudsTest { */ MCVAPI ~ActorInCloudsTest(); #endif + /** + * @symbol ??0ActorInCloudsTest\@\@QEAA\@XZ + */ + MCAPI ActorInCloudsTest(); }; diff --git a/LiteLoader/include/llapi/mc/ActorInactivityTimerTest.hpp b/LiteLoader/include/llapi/mc/ActorInactivityTimerTest.hpp index 2142c02583..7dcaabfbf7 100644 --- a/LiteLoader/include/llapi/mc/ActorInactivityTimerTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorInactivityTimerTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorInactivityTimerTest. * */ -class ActorInactivityTimerTest { +class ActorInactivityTimerTest : public FilterTest { #define AFTER_EXTRA // Add Member There @@ -36,35 +36,15 @@ class ActorInactivityTimerTest { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?setup\@SimpleIntFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z - */ - virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** * @vftbl 2 * @symbol ?evaluate\@ActorInactivityTimerTest\@\@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\@ActorInactivityTimerTest\@\@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\@SimpleIntFilterTest\@\@MEBA?AVValue\@Json\@\@XZ - */ - virtual class Json::Value _serializeValue() const; }; diff --git a/LiteLoader/include/llapi/mc/ActorInventoryUtils.hpp b/LiteLoader/include/llapi/mc/ActorInventoryUtils.hpp index e9a4732783..8e5853082e 100644 --- a/LiteLoader/include/llapi/mc/ActorInventoryUtils.hpp +++ b/LiteLoader/include/llapi/mc/ActorInventoryUtils.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "ItemStackBase.hpp" #define BEFORE_EXTRA @@ -44,12 +45,12 @@ namespace ActorInventoryUtils { */ MCAPI class ItemStack const * getItem(class Actor const &, enum class EquipmentSlot, int); /** - * @symbol ?queryActorEquipmentSlotForItem\@ActorInventoryUtils\@\@YA_NAEBVActor\@\@AEBVItemInstance\@\@W4EquipmentSlot\@\@AEBVCommandIntegerRange\@\@3_N\@Z + * @symbol ?queryActorEquipmentSlotForItem\@ActorInventoryUtils\@\@YA_NAEBVActor\@\@AEBVItemInstance\@\@W4EquipmentSlot\@\@AEBVCommandIntegerRange\@\@3AEBUComparisonOptions\@ItemStackBase\@\@\@Z */ - MCAPI bool queryActorEquipmentSlotForItem(class Actor const &, class ItemInstance const &, enum class EquipmentSlot, class CommandIntegerRange const &, class CommandIntegerRange const &, bool); + MCAPI bool queryActorEquipmentSlotForItem(class Actor const &, class ItemInstance const &, enum class EquipmentSlot, class CommandIntegerRange const &, class CommandIntegerRange const &, struct ItemStackBase::ComparisonOptions const &); /** - * @symbol ?queryActorForItem\@ActorInventoryUtils\@\@YA_NAEBVActor\@\@AEBVItemInstance\@\@AEBVCommandIntegerRange\@\@_N\@Z + * @symbol ?queryActorForItem\@ActorInventoryUtils\@\@YA_NAEBVActor\@\@AEBVItemInstance\@\@AEBVCommandIntegerRange\@\@AEBUComparisonOptions\@ItemStackBase\@\@\@Z */ - MCAPI bool queryActorForItem(class Actor const &, class ItemInstance const &, class CommandIntegerRange const &, bool); + MCAPI bool queryActorForItem(class Actor const &, class ItemInstance const &, class CommandIntegerRange const &, struct ItemStackBase::ComparisonOptions const &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorIsColorTest.hpp b/LiteLoader/include/llapi/mc/ActorIsColorTest.hpp index 6ceca6c8d0..fd1a94c5a8 100644 --- a/LiteLoader/include/llapi/mc/ActorIsColorTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsColorTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorIsColorTest. * */ -class ActorIsColorTest { +class ActorIsColorTest : public FilterTest { #define AFTER_EXTRA // Add Member There @@ -36,36 +36,16 @@ class ActorIsColorTest { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?setup\@SimpleIntFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z - */ - virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** * @vftbl 2 * @symbol ?evaluate\@ActorIsColorTest\@\@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\@ActorIsColorTest\@\@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\@SimpleIntFilterTest\@\@MEBA?AVValue\@Json\@\@XZ - */ - virtual class Json::Value _serializeValue() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORISCOLORTEST /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ActorIsMarkVariantTest.hpp b/LiteLoader/include/llapi/mc/ActorIsMarkVariantTest.hpp index 94f3276ff8..abb5f78dfa 100644 --- a/LiteLoader/include/llapi/mc/ActorIsMarkVariantTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsMarkVariantTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorIsMarkVariantTest. * */ -class ActorIsMarkVariantTest { +class ActorIsMarkVariantTest : public FilterTest { #define AFTER_EXTRA // Add Member There @@ -36,36 +36,16 @@ class ActorIsMarkVariantTest { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?setup\@SimpleIntFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z - */ - virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** * @vftbl 2 * @symbol ?evaluate\@ActorIsMarkVariantTest\@\@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\@ActorIsMarkVariantTest\@\@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\@SimpleIntFilterTest\@\@MEBA?AVValue\@Json\@\@XZ - */ - virtual class Json::Value _serializeValue() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORISMARKVARIANTTEST /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ActorIsSkinIDTest.hpp b/LiteLoader/include/llapi/mc/ActorIsSkinIDTest.hpp index ed07013802..fec7bf53a7 100644 --- a/LiteLoader/include/llapi/mc/ActorIsSkinIDTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsSkinIDTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorIsSkinIDTest. * */ -class ActorIsSkinIDTest { +class ActorIsSkinIDTest : public FilterTest { #define AFTER_EXTRA // Add Member There @@ -36,36 +36,16 @@ class ActorIsSkinIDTest { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?setup\@SimpleIntFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z - */ - virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** * @vftbl 2 * @symbol ?evaluate\@ActorIsSkinIDTest\@\@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\@ActorIsSkinIDTest\@\@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\@SimpleIntFilterTest\@\@MEBA?AVValue\@Json\@\@XZ - */ - virtual class Json::Value _serializeValue() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORISSKINIDTEST /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ActorIsVariantTest.hpp b/LiteLoader/include/llapi/mc/ActorIsVariantTest.hpp index f533ef3fc6..efe8557be4 100644 --- a/LiteLoader/include/llapi/mc/ActorIsVariantTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsVariantTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorIsVariantTest. * */ -class ActorIsVariantTest { +class ActorIsVariantTest : public FilterTest { #define AFTER_EXTRA // Add Member There @@ -36,36 +36,16 @@ class ActorIsVariantTest { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?setup\@SimpleIntFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z - */ - virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** * @vftbl 2 * @symbol ?evaluate\@ActorIsVariantTest\@\@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\@ActorIsVariantTest\@\@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\@SimpleIntFilterTest\@\@MEBA?AVValue\@Json\@\@XZ - */ - virtual class Json::Value _serializeValue() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORISVARIANTTEST /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ActorManager.hpp b/LiteLoader/include/llapi/mc/ActorManager.hpp index 1eaa267d02..b41f4692ee 100644 --- a/LiteLoader/include/llapi/mc/ActorManager.hpp +++ b/LiteLoader/include/llapi/mc/ActorManager.hpp @@ -34,14 +34,14 @@ class ActorManager { * @symbol ??0ActorManager\@\@QEAA\@XZ */ MCAPI ActorManager(); - /** - * @symbol ?addActorEntity\@ActorManager\@\@QEAAPEAVActor\@\@AEAVDimension\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z - */ - MCAPI class Actor * addActorEntity(class Dimension &, class OwnerPtrT); /** * @symbol ?addActorEntity\@ActorManager\@\@QEAAPEAVActor\@\@AEAVIAddActorEntityProxy\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z */ MCAPI class Actor * addActorEntity(class IAddActorEntityProxy &, class OwnerPtrT); + /** + * @symbol ?addActorEntity\@ActorManager\@\@QEAAPEAVActor\@\@AEAVDimension\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z + */ + MCAPI class Actor * addActorEntity(class Dimension &, class OwnerPtrT); /** * @symbol ?cleanupActorEntityReferencesGarbageCollect\@ActorManager\@\@QEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorMapping.hpp b/LiteLoader/include/llapi/mc/ActorMapping.hpp index 13547a9d19..768b2adf3d 100644 --- a/LiteLoader/include/llapi/mc/ActorMapping.hpp +++ b/LiteLoader/include/llapi/mc/ActorMapping.hpp @@ -26,14 +26,14 @@ struct ActorMapping { #endif public: - /** - * @symbol ??0ActorMapping\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z - */ - MCAPI ActorMapping(std::string const &, std::string const &); /** * @symbol ??0ActorMapping\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z */ MCAPI ActorMapping(std::string const &, std::string const &, std::string const &); + /** + * @symbol ??0ActorMapping\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + */ + MCAPI ActorMapping(std::string const &, std::string const &); /** * @symbol ?getMappingName\@ActorMapping\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ActorTypeNamespaceRules\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorMobilityUtils.hpp b/LiteLoader/include/llapi/mc/ActorMobilityUtils.hpp index 2d36a8092c..21449a140b 100644 --- a/LiteLoader/include/llapi/mc/ActorMobilityUtils.hpp +++ b/LiteLoader/include/llapi/mc/ActorMobilityUtils.hpp @@ -20,17 +20,21 @@ namespace ActorMobilityUtils { #undef AFTER_EXTRA /** - * @symbol ?actorSetSize\@ActorMobilityUtils\@\@YAXAEAVStrictEntityContext\@\@AEBVVec2\@\@AEAUSynchedActorDataComponent\@\@AEAUAABBShapeComponent\@\@AEBUStateVectorComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UWasPenetratingLastFrameFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@UOffsetsComponent\@\@\@\@\@Z + * @symbol ?_playerOnSizeUpdated\@ActorMobilityUtils\@\@YAXV?$optional_ref\@UOffsetsComponent\@\@\@\@\@Z */ - MCAPI void actorSetSize(class StrictEntityContext &, class Vec2 const &, struct SynchedActorDataComponent &, struct AABBShapeComponent &, struct StateVectorComponent const &, class EntityModifierT> &, class ViewT>, struct OffsetsComponent>); + MCAPI void _playerOnSizeUpdated(class optional_ref); + /** + * @symbol ?actorSetSize\@ActorMobilityUtils\@\@YA?AW4ActorShouldCallOnSetSize\@\@AEBVStrictEntityContext\@\@AEBVVec2\@\@AEAUSynchedActorDataComponent\@\@AEAUAABBShapeComponent\@\@AEBUStateVectorComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UWasPenetratingLastFrameFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@UOffsetsComponent\@\@\@\@\@Z + */ + //MCAPI enum class ActorShouldCallOnSetSize actorSetSize(class StrictEntityContext const &, class Vec2 const &, struct SynchedActorDataComponent &, struct AABBShapeComponent &, struct StateVectorComponent const &, class EntityModifierT> &, class ViewT>, struct OffsetsComponent>); /** * @symbol ?allowAscendingScaffolding\@ActorMobilityUtils\@\@YA_NPEBV?$FlagComponent\@UWasAutoJumpingFlag\@\@\@\@\@Z */ MCAPI bool allowAscendingScaffolding(class FlagComponent const *); /** - * @symbol ?applyFinalFriction\@ActorMobilityUtils\@\@YAXPEBUCurrentLocalMoveVelocityComponent\@\@PEBV?$FlagComponent\@UVexFlag\@\@\@\@PEBV?$FlagComponent\@UVRModeFlag\@\@\@\@PEBUAbilitiesComponent\@\@AEBUSynchedActorDataComponent\@\@AEAUStateVectorComponent\@\@M_N\@Z + * @symbol ?applyFinalFriction\@ActorMobilityUtils\@\@YAXPEBUCurrentLocalMoveVelocityComponent\@\@PEBV?$FlagComponent\@UVexFlag\@\@\@\@PEBUAbilitiesComponent\@\@AEBUSynchedActorDataComponent\@\@AEAUStateVectorComponent\@\@M_N5\@Z */ - MCAPI void applyFinalFriction(struct CurrentLocalMoveVelocityComponent const *, class FlagComponent const *, class FlagComponent const *, struct AbilitiesComponent const *, struct SynchedActorDataComponent const &, struct StateVectorComponent &, float, bool); + MCAPI void applyFinalFriction(struct CurrentLocalMoveVelocityComponent const *, class FlagComponent const *, struct AbilitiesComponent const *, struct SynchedActorDataComponent const &, struct StateVectorComponent &, float, bool, bool); /** * @symbol ?canBeginOrContinueClimbingLadder\@ActorMobilityUtils\@\@YA_NAEBUAABBShapeComponent\@\@AEBVIConstBlockSource\@\@AEBUStateVectorComponent\@\@AEBUSynchedActorDataComponent\@\@_N4\@Z */ @@ -50,11 +54,11 @@ 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> &); + //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 ?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 */ - MCAPI float getBrightness(class StrictEntityContext const &, float, class IConstBlockSource const &, struct AABBShapeComponent const &, struct OffsetsComponent const &, struct StateVectorComponent const &, class ViewT>>, class ViewT>>); + //MCAPI float getBrightness(class StrictEntityContext const &, float, class IConstBlockSource const &, struct AABBShapeComponent const &, struct OffsetsComponent const &, struct StateVectorComponent const &, class ViewT>>, class ViewT>>); /** * @symbol ?getJumpEffectAmplifierValue\@ActorMobilityUtils\@\@YAMAEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@\@Z */ @@ -70,7 +74,11 @@ 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 &); + //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 */ @@ -79,6 +87,10 @@ namespace ActorMobilityUtils { * @symbol ?isFree\@ActorMobilityUtils\@\@YA_NAEBVIConstBlockSource\@\@AEBVAABB\@\@AEBVVec3\@\@M\@Z */ MCAPI bool isFree(class IConstBlockSource const &, class AABB const &, class Vec3 const &, float); + /** + * @symbol ?isGliding\@ActorMobilityUtils\@\@YA_NAEBUSynchedActorDataComponent\@\@\@Z + */ + MCAPI bool isGliding(struct SynchedActorDataComponent const &); /** * @symbol ?isImmersedInWater\@ActorMobilityUtils\@\@YA_NAEBVVec3\@\@AEBVIConstBlockSource\@\@AEBVVec2\@\@\@Z */ @@ -86,7 +98,7 @@ namespace ActorMobilityUtils { /** * @symbol ?isImmobile\@ActorMobilityUtils\@\@YA_NAEBVStrictEntityContext\@\@PEAV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUSynchedActorDataComponent\@\@V?$Optional\@V?$FlagComponent\@UActorIsImmobileFlag\@\@\@\@\@\@\@\@PEAV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@$$CBUAttributesComponent\@\@V?$Optional\@V?$FlagComponent\@UActorIsKnockedBackOnDeathFlag\@\@\@\@\@\@\@\@PEAV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUSynchedActorDataComponent\@\@U?$Include\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@U?$Exclude\@V?$FlagComponent\@UMobAllowStandSlidingFlag\@\@\@\@V?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@\@PEAV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@PEAV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@UPlayerIsSleepingFlag\@\@\@\@$$CBV?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@\@Z */ - MCAPI bool isImmobile(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> *); + //MCAPI bool isImmobile(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> *); /** * @symbol ?isInLava\@ActorMobilityUtils\@\@YA_NAEBVIConstBlockSource\@\@AEBUAABBShapeComponent\@\@AEBUSubBBsComponent\@\@\@Z */ @@ -95,6 +107,10 @@ namespace ActorMobilityUtils { * @symbol ?isOnFire\@ActorMobilityUtils\@\@YA_NAEBUSynchedActorDataComponent\@\@PEBUOnFireComponent\@\@PEBV?$FlagComponent\@ULavaSlimeFlag\@\@\@\@PEBV?$FlagComponent\@UShulkerBulletFlag\@\@\@\@PEBV?$FlagComponent\@UWitherSkullFlag\@\@\@\@PEBV?$FlagComponent\@UBlazeFlag\@\@\@\@\@Z */ MCAPI bool isOnFire(struct SynchedActorDataComponent const &, struct OnFireComponent const *, class FlagComponent const *, class FlagComponent const *, class FlagComponent const *, class FlagComponent const *); + /** + * @symbol ?isSneaking\@ActorMobilityUtils\@\@YA_NAEBUSynchedActorDataComponent\@\@\@Z + */ + MCAPI bool isSneaking(struct SynchedActorDataComponent const &); /** * @symbol ?isSprinting\@ActorMobilityUtils\@\@YA_NAEBUSynchedActorDataComponent\@\@\@Z */ @@ -115,6 +131,10 @@ namespace ActorMobilityUtils { * @symbol ?onClimbableBlock\@ActorMobilityUtils\@\@YA_NAEBUAABBShapeComponent\@\@AEBVIConstBlockSource\@\@AEBUStateVectorComponent\@\@_N3\@Z */ MCAPI bool onClimbableBlock(struct AABBShapeComponent const &, class IConstBlockSource const &, struct StateVectorComponent const &, bool, bool); + /** + * @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 */ @@ -122,7 +142,7 @@ namespace ActorMobilityUtils { /** * @symbol ?setSpeed\@ActorMobilityUtils\@\@YAXAEBVStrictEntityContext\@\@MAEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UMovementSpeedComponent\@\@ULocalMoveVelocityComponent\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@\@\@\@Z */ - MCAPI void setSpeed(class StrictEntityContext const &, float, class ViewT const &, class ViewT>> const &); + //MCAPI void setSpeed(class StrictEntityContext const &, float, class ViewT const &, class ViewT>> const &); /** * @symbol ?setSprinting\@ActorMobilityUtils\@\@YAXAEAUAttributesComponent\@\@AEAUSynchedActorDataComponent\@\@V?$optional_ref\@UPlayerActionComponent\@\@\@\@_N\@Z */ @@ -131,6 +151,10 @@ namespace ActorMobilityUtils { * @symbol ?setStanding\@ActorMobilityUtils\@\@YAXVSynchedActorDataWriter\@\@_NPEAUHorseStandCounterComponent\@\@1\@Z */ MCAPI void setStanding(class SynchedActorDataWriter, bool, struct HorseStandCounterComponent *, bool); + /** + * @symbol ?shouldApplyLava\@ActorMobilityUtils\@\@YA_NAEBVIConstBlockSource\@\@AEBVEntityContext\@\@\@Z + */ + MCAPI bool shouldApplyLava(class IConstBlockSource const &, class EntityContext const &); /** * @symbol ?shouldApplyWaterGravity\@ActorMobilityUtils\@\@YA_NPEBVNavigationComponent\@\@PEBVPhysicsComponent\@\@VSynchedActorDataReader\@\@AEBVVec3\@\@AEBVIConstBlockSource\@\@AEBVVec2\@\@\@Z */ @@ -142,6 +166,6 @@ namespace ActorMobilityUtils { /** * @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>); + //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/ActorMoveToSystem.hpp b/LiteLoader/include/llapi/mc/ActorMoveToSystem.hpp deleted file mode 100644 index 41b39f3afb..0000000000 --- a/LiteLoader/include/llapi/mc/ActorMoveToSystem.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file ActorMoveToSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class ActorMoveToSystem. - * - */ -class ActorMoveToSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORMOVETOSYSTEM -public: - class ActorMoveToSystem& operator=(class ActorMoveToSystem const &) = delete; - ActorMoveToSystem(class ActorMoveToSystem const &) = delete; - ActorMoveToSystem() = delete; -#endif - -public: - /** - * @symbol ?createActorMoveToSystem\@ActorMoveToSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createActorMoveToSystem(); - -}; diff --git a/LiteLoader/include/llapi/mc/ActorOwnerComponent.hpp b/LiteLoader/include/llapi/mc/ActorOwnerComponent.hpp index 7a9d765a7e..84c9fe412b 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\@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 ??0ActorOwnerComponent\@\@QEAA\@V?$unique_ptr\@VActor\@\@U?$default_delete\@VActor\@\@\@std\@\@\@std\@\@\@Z + */ + MCAPI ActorOwnerComponent(std::unique_ptr); /** * @symbol ?getActor\@ActorOwnerComponent\@\@QEBAAEAVActor\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ActorPassengerCountTest.hpp b/LiteLoader/include/llapi/mc/ActorPassengerCountTest.hpp index 0a680bd511..570277c1a9 100644 --- a/LiteLoader/include/llapi/mc/ActorPassengerCountTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorPassengerCountTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorPassengerCountTest. * */ -class ActorPassengerCountTest { +class ActorPassengerCountTest : public FilterTest { #define AFTER_EXTRA // Add Member There @@ -36,36 +36,16 @@ class ActorPassengerCountTest { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?setup\@SimpleIntFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z - */ - virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** * @vftbl 2 * @symbol ?evaluate\@ActorPassengerCountTest\@\@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\@ActorPassengerCountTest\@\@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\@SimpleIntFilterTest\@\@MEBA?AVValue\@Json\@\@XZ - */ - virtual class Json::Value _serializeValue() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORPASSENGERCOUNTTEST /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ActorPermission.hpp b/LiteLoader/include/llapi/mc/ActorPermission.hpp new file mode 100644 index 0000000000..6b5bcc8a20 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorPermission.hpp @@ -0,0 +1,32 @@ +/** + * @file ActorPermission.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace ActorPermission { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?getUnmappedGameType\@ActorPermission\@\@YA?AW4GameType\@\@AEBVEntityContext\@\@\@Z + */ + MCAPI enum class GameType getUnmappedGameType(class EntityContext const &); + /** + * @symbol ?initialize\@ActorPermission\@\@YAXAEAVEntityContext\@\@\@Z + */ + MCAPI void initialize(class EntityContext &); + /** + * @symbol ?setUnmappedGameType\@ActorPermission\@\@YAXAEAVEntityContext\@\@W4GameType\@\@\@Z + */ + MCAPI void setUnmappedGameType(class EntityContext &, enum class GameType); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorPickRequestPacket.hpp b/LiteLoader/include/llapi/mc/ActorPickRequestPacket.hpp index 369e7f22ea..d61c646dad 100644 --- a/LiteLoader/include/llapi/mc/ActorPickRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/ActorPickRequestPacket.hpp @@ -51,9 +51,9 @@ class ActorPickRequestPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ActorPickRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ActorPickRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ActorPickRequestPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ActorPlacerItem.hpp b/LiteLoader/include/llapi/mc/ActorPlacerItem.hpp index 00a0c4449b..84975221bc 100644 --- a/LiteLoader/include/llapi/mc/ActorPlacerItem.hpp +++ b/LiteLoader/include/llapi/mc/ActorPlacerItem.hpp @@ -41,11 +41,6 @@ class ActorPlacerItem : public Item { * @symbol ?tearDown\@ActorPlacerItem\@\@UEAAXXZ */ virtual void tearDown(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -61,6 +56,11 @@ class ActorPlacerItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -137,12 +137,22 @@ class ActorPlacerItem : public Item { */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 118 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 120 * @symbol ?getIconInfo\@ActorPlacerItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 132 + * @vftbl 134 * @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/ActorRandomChanceTest.hpp b/LiteLoader/include/llapi/mc/ActorRandomChanceTest.hpp index 8c0331dd06..884a6c7f06 100644 --- a/LiteLoader/include/llapi/mc/ActorRandomChanceTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorRandomChanceTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorRandomChanceTest. * */ -class ActorRandomChanceTest { +class ActorRandomChanceTest : public FilterTest { #define AFTER_EXTRA // Add Member There @@ -36,35 +36,15 @@ class ActorRandomChanceTest { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?setup\@SimpleIntFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z - */ - virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** * @vftbl 2 * @symbol ?evaluate\@ActorRandomChanceTest\@\@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\@ActorRandomChanceTest\@\@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\@SimpleIntFilterTest\@\@MEBA?AVValue\@Json\@\@XZ - */ - virtual class Json::Value _serializeValue() const; }; diff --git a/LiteLoader/include/llapi/mc/ActorRemovedEvent.hpp b/LiteLoader/include/llapi/mc/ActorRemovedEvent.hpp new file mode 100644 index 0000000000..7fa0ffac0a --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorRemovedEvent.hpp @@ -0,0 +1,32 @@ +/** + * @file ActorRemovedEvent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct ActorRemovedEvent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORREMOVEDEVENT +public: + struct ActorRemovedEvent& operator=(struct ActorRemovedEvent const &) = delete; + ActorRemovedEvent(struct ActorRemovedEvent const &) = delete; + ActorRemovedEvent() = delete; +#endif + +public: + /** + * @symbol ??1ActorRemovedEvent\@\@QEAA\@XZ + */ + MCAPI ~ActorRemovedEvent(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorSetPosSystem.hpp b/LiteLoader/include/llapi/mc/ActorSetPosSystem.hpp new file mode 100644 index 0000000000..de0330162b --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorSetPosSystem.hpp @@ -0,0 +1,74 @@ +/** + * @file ActorSetPosSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ActorSetPosSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORSETPOSSYSTEM +public: + class ActorSetPosSystem& operator=(class ActorSetPosSystem const &) = delete; + ActorSetPosSystem(class ActorSetPosSystem const &) = delete; + ActorSetPosSystem() = 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\@ActorSetPosSystem\@\@UEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UActorAddedFlag\@\@\@\@V?$FlagComponent\@UActorRemovedFlag\@\@\@\@V?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UPaintingFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UShulkerFlag\@\@\@\@\@\@U?$Read\@VActorOwnerComponent\@\@UChunkPositionComponent\@\@UOffsetsComponent\@\@USlideOffsetComponent\@\@\@\@U?$Write\@UAABBShapeComponent\@\@UActorSetPositionRequestComponent\@\@VHitboxComponent\@\@UStateVectorComponent\@\@USynchedActorDataComponent\@\@\@\@U?$AddRemove\@V?$FlagComponent\@UActorChunkMoveFlag\@\@\@\@V?$FlagComponent\@UActorLocalPlayerEntityMovedFlag\@\@\@\@UActorSetPositionRequestComponent\@\@\@\@U?$GlobalRead\@$$V\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + */ + virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove, class FlagComponent, struct ActorSetPositionRequestComponent>, struct GlobalRead<>, struct GlobalWrite<>, struct EntityFactoryT<>> &); + /** + * @vftbl 5 + * @symbol ?singleTick\@ActorSetPosSystem\@\@UEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UActorAddedFlag\@\@\@\@V?$FlagComponent\@UActorRemovedFlag\@\@\@\@V?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UPaintingFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UShulkerFlag\@\@\@\@\@\@U?$Read\@VActorOwnerComponent\@\@UChunkPositionComponent\@\@UOffsetsComponent\@\@USlideOffsetComponent\@\@\@\@U?$Write\@UAABBShapeComponent\@\@UActorSetPositionRequestComponent\@\@VHitboxComponent\@\@UStateVectorComponent\@\@USynchedActorDataComponent\@\@\@\@U?$AddRemove\@V?$FlagComponent\@UActorChunkMoveFlag\@\@\@\@V?$FlagComponent\@UActorLocalPlayerEntityMovedFlag\@\@\@\@UActorSetPositionRequestComponent\@\@\@\@U?$GlobalRead\@$$V\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@AEAVStrictEntityContext\@\@\@Z + */ + virtual void singleTick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove, class FlagComponent, struct ActorSetPositionRequestComponent>, struct GlobalRead<>, struct GlobalWrite<>, struct EntityFactoryT<>> &, class StrictEntityContext &); + /** + * @symbol ?actorUpdateOwnerChunk\@ActorSetPosSystem\@\@SAXAEAVEntityContext\@\@\@Z + */ + MCAPI static void actorUpdateOwnerChunk(class EntityContext &); + /** + * @symbol ?createSystem\@ActorSetPosSystem\@\@SA?AUTickingSystemWithInfo\@\@_N\@Z + */ + MCAPI static struct TickingSystemWithInfo createSystem(bool); + /** + * @symbol ?moveHitboxTo\@ActorSetPosSystem\@\@SAXAEBVVec3\@\@AEAV?$vector\@UHitbox\@\@V?$allocator\@UHitbox\@\@\@std\@\@\@std\@\@\@Z + */ + MCAPI static void moveHitboxTo(class Vec3 const &, std::vector &); + /** + * @symbol ?refreshAABB\@ActorSetPosSystem\@\@SA?AVAABB\@\@MAEBVVec3\@\@AEBVVec2\@\@1\@Z + */ + MCAPI static class AABB refreshAABB(float, class Vec3 const &, class Vec2 const &, class Vec2 const &); + +}; diff --git a/LiteLoader/include/llapi/mc/ActorSetPosSystemImpl.hpp b/LiteLoader/include/llapi/mc/ActorSetPosSystemImpl.hpp new file mode 100644 index 0000000000..cb9499f33e --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorSetPosSystemImpl.hpp @@ -0,0 +1,48 @@ +/** + * @file ActorSetPosSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace ActorSetPosSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?_tickActorUpdatePositionAndAABBSystem2\@ActorSetPosSystemImpl\@\@YAXAEBUActorSetPositionRequestComponent\@\@AEBUOffsetsComponent\@\@AEBUSlideOffsetComponent\@\@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>); + /** + * @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 + */ + MCAPI void _tickChunkMoveNeededSystemAsynchronous4(class StrictEntityContext &, struct ChunkPositionComponent const &, struct StateVectorComponent const &, class EntityModifierT, class FlagComponent, struct ActorSetPositionRequestComponent>); + /** + * @symbol ?_tickChunkMoveNeededSystemSynchronous4\@ActorSetPosSystemImpl\@\@YAXAEBVActorOwnerComponent\@\@AEBUChunkPositionComponent\@\@AEBUStateVectorComponent\@\@\@Z + */ + MCAPI void _tickChunkMoveNeededSystemSynchronous4(class ActorOwnerComponent const &, struct ChunkPositionComponent const &, struct StateVectorComponent const &); + /** + * @symbol ?_tickMoveHitboxSystem3\@ActorSetPosSystemImpl\@\@YAXAEBUActorSetPositionRequestComponent\@\@AEAVHitboxComponent\@\@\@Z + */ + MCAPI void _tickMoveHitboxSystem3(struct ActorSetPositionRequestComponent const &, class HitboxComponent &); + /** + * @symbol ?_tickShulkerUpdatePositionSystem5\@ActorSetPosSystemImpl\@\@YAXAEBUStateVectorComponent\@\@AEAUSynchedActorDataComponent\@\@\@Z + */ + MCAPI void _tickShulkerUpdatePositionSystem5(struct StateVectorComponent const &, struct SynchedActorDataComponent &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorUpdatePositionSystem.hpp b/LiteLoader/include/llapi/mc/ActorUpdatePositionSystem.hpp deleted file mode 100644 index d1169424e7..0000000000 --- a/LiteLoader/include/llapi/mc/ActorUpdatePositionSystem.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file ActorUpdatePositionSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class ActorUpdatePositionSystem. - * - */ -class ActorUpdatePositionSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORUPDATEPOSITIONSYSTEM -public: - class ActorUpdatePositionSystem& operator=(class ActorUpdatePositionSystem const &) = delete; - ActorUpdatePositionSystem(class ActorUpdatePositionSystem const &) = delete; - ActorUpdatePositionSystem() = delete; -#endif - -public: - /** - * @symbol ?createActorUpdatePositionSystem\@ActorUpdatePositionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createActorUpdatePositionSystem(); - -}; diff --git a/LiteLoader/include/llapi/mc/ActorUtil.hpp b/LiteLoader/include/llapi/mc/ActorUtil.hpp index 2b980f865e..6d46162ed2 100644 --- a/LiteLoader/include/llapi/mc/ActorUtil.hpp +++ b/LiteLoader/include/llapi/mc/ActorUtil.hpp @@ -21,6 +21,10 @@ namespace ActorUtil { // Add Member There #undef AFTER_EXTRA + /** + * @symbol ?canActorBeKilled\@ActorUtil\@\@YA?BW4CanBeKilledResult\@1\@AEBVActor\@\@_N\@Z + */ + MCAPI enum class ActorUtil::CanBeKilledResult const canActorBeKilled(class Actor const &, bool); /** * @symbol ?startFizzEffect\@ActorUtil\@\@YAXAEAVActor\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorValueValidation.hpp b/LiteLoader/include/llapi/mc/ActorValueValidation.hpp index 5ad78b5eb2..683aab0a0b 100644 --- a/LiteLoader/include/llapi/mc/ActorValueValidation.hpp +++ b/LiteLoader/include/llapi/mc/ActorValueValidation.hpp @@ -23,14 +23,14 @@ namespace ActorValueValidation { * @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 - */ - MCAPI void _fireTelemetryEvent(std::string const &, char const *); /** * @symbol ?_fireTelemetryEvent\@ActorValueValidation\@\@YAXAEBVVec3\@\@PEBD\@Z */ MCAPI void _fireTelemetryEvent(class Vec3 const &, char const *); + /** + * @symbol ?_fireTelemetryEvent\@ActorValueValidation\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBD\@Z + */ + MCAPI void _fireTelemetryEvent(std::string const &, char const *); /** * @symbol ?isLegalPlayerPosition\@ActorValueValidation\@\@YA_NAEBVVec3\@\@PEBD\@Z */ diff --git a/LiteLoader/include/llapi/mc/AddActorPacket.hpp b/LiteLoader/include/llapi/mc/AddActorPacket.hpp index 34e8dd586f..11cc0e0842 100644 --- a/LiteLoader/include/llapi/mc/AddActorPacket.hpp +++ b/LiteLoader/include/llapi/mc/AddActorPacket.hpp @@ -51,9 +51,9 @@ class AddActorPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@AddActorPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@AddActorPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ADDACTORPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/AddBehaviorTreePacket.hpp b/LiteLoader/include/llapi/mc/AddBehaviorTreePacket.hpp index 79bc39555f..a7df2bd1bb 100644 --- a/LiteLoader/include/llapi/mc/AddBehaviorTreePacket.hpp +++ b/LiteLoader/include/llapi/mc/AddBehaviorTreePacket.hpp @@ -51,9 +51,9 @@ class AddBehaviorTreePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@AddBehaviorTreePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@AddBehaviorTreePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0AddBehaviorTreePacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/AddItemActorPacket.hpp b/LiteLoader/include/llapi/mc/AddItemActorPacket.hpp index 43fcd4cdab..2371bdbbfa 100644 --- a/LiteLoader/include/llapi/mc/AddItemActorPacket.hpp +++ b/LiteLoader/include/llapi/mc/AddItemActorPacket.hpp @@ -51,9 +51,9 @@ class AddItemActorPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@AddItemActorPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@AddItemActorPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0AddItemActorPacket\@\@QEAA\@AEAVItemActor\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/AddLocalPlayerEntityMovedSystem.hpp b/LiteLoader/include/llapi/mc/AddLocalPlayerEntityMovedSystem.hpp deleted file mode 100644 index 3b72ed4fbb..0000000000 --- a/LiteLoader/include/llapi/mc/AddLocalPlayerEntityMovedSystem.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file AddLocalPlayerEntityMovedSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class AddLocalPlayerEntityMovedSystem. - * - */ -class AddLocalPlayerEntityMovedSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ADDLOCALPLAYERENTITYMOVEDSYSTEM -public: - class AddLocalPlayerEntityMovedSystem& operator=(class AddLocalPlayerEntityMovedSystem const &) = delete; - AddLocalPlayerEntityMovedSystem(class AddLocalPlayerEntityMovedSystem const &) = delete; - AddLocalPlayerEntityMovedSystem() = delete; -#endif - -public: - /** - * @symbol ?createAddLocalPlayerEntityMovedSystem\@AddLocalPlayerEntityMovedSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createAddLocalPlayerEntityMovedSystem(); - -}; diff --git a/LiteLoader/include/llapi/mc/AddPaintingPacket.hpp b/LiteLoader/include/llapi/mc/AddPaintingPacket.hpp index 7db2fcc7df..fc19765cce 100644 --- a/LiteLoader/include/llapi/mc/AddPaintingPacket.hpp +++ b/LiteLoader/include/llapi/mc/AddPaintingPacket.hpp @@ -51,16 +51,16 @@ class AddPaintingPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@AddPaintingPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@AddPaintingPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); - /** - * @symbol ??0AddPaintingPacket\@\@QEAA\@XZ - */ - MCAPI AddPaintingPacket(); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0AddPaintingPacket\@\@QEAA\@AEBVPainting\@\@\@Z */ MCAPI AddPaintingPacket(class Painting const &); + /** + * @symbol ??0AddPaintingPacket\@\@QEAA\@XZ + */ + MCAPI AddPaintingPacket(); }; diff --git a/LiteLoader/include/llapi/mc/AddPlayerPacket.hpp b/LiteLoader/include/llapi/mc/AddPlayerPacket.hpp index fa4c9228cb..5d1ac35844 100644 --- a/LiteLoader/include/llapi/mc/AddPlayerPacket.hpp +++ b/LiteLoader/include/llapi/mc/AddPlayerPacket.hpp @@ -51,22 +51,22 @@ class AddPlayerPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@AddPlayerPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@AddPlayerPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ADDPLAYERPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~AddPlayerPacket(); #endif - /** - * @symbol ??0AddPlayerPacket\@\@QEAA\@XZ - */ - MCAPI AddPlayerPacket(); /** * @symbol ??0AddPlayerPacket\@\@QEAA\@AEAVPlayer\@\@\@Z */ MCAPI AddPlayerPacket(class Player &); + /** + * @symbol ??0AddPlayerPacket\@\@QEAA\@XZ + */ + MCAPI AddPlayerPacket(); }; diff --git a/LiteLoader/include/llapi/mc/AddVolumeEntityPacket.hpp b/LiteLoader/include/llapi/mc/AddVolumeEntityPacket.hpp index a5f60d64de..cc9ebc7be8 100644 --- a/LiteLoader/include/llapi/mc/AddVolumeEntityPacket.hpp +++ b/LiteLoader/include/llapi/mc/AddVolumeEntityPacket.hpp @@ -52,9 +52,9 @@ class AddVolumeEntityPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@AddVolumeEntityPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@AddVolumeEntityPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 a942c5fda0..d4198c74a4 100644 --- a/LiteLoader/include/llapi/mc/Agent.hpp +++ b/LiteLoader/include/llapi/mc/Agent.hpp @@ -42,235 +42,220 @@ class Agent : public Mob { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 44 + * @vftbl 43 * @symbol ?teleportTo\@Agent\@\@UEAAXAEBVVec3\@\@_NHH1\@Z */ virtual void teleportTo(class Vec3 const &, bool, int, int, bool); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@Agent\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 60 + * @vftbl 59 * @symbol ?isInvisible\@Agent\@\@UEBA_NXZ */ virtual bool isInvisible() const; /** - * @vftbl 61 + * @vftbl 60 * @symbol ?canShowNameTag\@Agent\@\@UEBA_NXZ */ virtual bool canShowNameTag() const; /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 66 + * @vftbl 65 * @symbol ?getFormattedNameTag\@Agent\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getFormattedNameTag() const; /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 - */ - virtual void __unk_vfn_88(); - /** - * @vftbl 95 + * @vftbl 93 * @symbol ?isPickable\@Agent\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 + */ + virtual void __unk_vfn_94(); + /** + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 119 + * @vftbl 117 * @symbol ?setOwner\@Agent\@\@UEAAXUActorUniqueID\@\@\@Z */ virtual void setOwner(struct ActorUniqueID); /** - * @vftbl 141 + * @vftbl 139 * @symbol ?handleEntityEvent\@Agent\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 158 + * @vftbl 156 * @symbol ?setCarriedItem\@Agent\@\@UEAAXAEBVItemStack\@\@\@Z */ virtual void setCarriedItem(class ItemStack const &); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 190 + * @vftbl 188 * @symbol ?canBePulledIntoVehicle\@Agent\@\@UEBA_NXZ */ virtual bool canBePulledIntoVehicle() const; /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 207 + * @vftbl 205 * @symbol ?canBeAffected\@Agent\@\@UEBA_NI\@Z */ virtual bool canBeAffected(unsigned int) const; /** - * @vftbl 217 - * @symbol __unk_vfn_217 - */ - virtual void __unk_vfn_217(); - /** - * @vftbl 218 - * @symbol __unk_vfn_218 - */ - virtual void __unk_vfn_218(); - /** - * @vftbl 222 - * @symbol ?isWorldBuilder\@Agent\@\@UEBA_NXZ + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual bool isWorldBuilder() const; + virtual void __unk_vfn_215(); /** - * @vftbl 224 - * @symbol ?isAdventure\@Agent\@\@UEBA_NXZ + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual bool isAdventure() const; + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 244 + * @vftbl 236 * @symbol ?kill\@Agent\@\@UEAAXXZ */ virtual void kill(); /** - * @vftbl 258 + * @vftbl 250 * @symbol ?updateEntitySpecificMolangVariables\@Agent\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@Agent\@\@EEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 276 + * @vftbl 268 * @symbol ?knockback\@Agent\@\@UEAAXPEAVActor\@\@HMMMMM\@Z */ virtual void knockback(class Actor *, int, float, float, float, float, float); /** - * @vftbl 286 + * @vftbl 278 * @symbol ?travel\@Agent\@\@UEAAXMMM_N\@Z */ virtual void travel(float, float, float, bool); /** - * @vftbl 288 + * @vftbl 280 * @symbol ?aiStep\@Agent\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 331 + * @vftbl 323 * @symbol ?createAIGoals\@Agent\@\@UEAA_NXZ */ virtual bool createAIGoals(); /** - * @vftbl 338 + * @vftbl 330 * @symbol ?canExistWhenDisallowMob\@Agent\@\@UEBA_NXZ */ virtual bool canExistWhenDisallowMob() const; /** - * @vftbl 343 + * @vftbl 335 * @symbol ?initBodyControl\@Agent\@\@EEAA?AV?$unique_ptr\@VBodyControl\@\@U?$default_delete\@VBodyControl\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr initBodyControl(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_AGENT /** * @symbol ?breaksFallingBlocks\@Agent\@\@UEBA_NXZ @@ -341,6 +326,14 @@ class Agent : public Mob { * @symbol ?stopCommandMode\@Agent\@\@QEAAXXZ */ MCAPI void stopCommandMode(); + /** + * @symbol ?swingAnimationCompleted\@Agent\@\@QEAA_NXZ + */ + MCAPI bool swingAnimationCompleted(); + /** + * @symbol ?swingArm\@Agent\@\@QEAAXXZ + */ + MCAPI void swingArm(); /** * @symbol ?tryFireCreateEvent\@Agent\@\@QEAAXAEAVPlayer\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/AgentActionEventPacket.hpp b/LiteLoader/include/llapi/mc/AgentActionEventPacket.hpp index 0062b54772..ad85c04b5a 100644 --- a/LiteLoader/include/llapi/mc/AgentActionEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/AgentActionEventPacket.hpp @@ -50,9 +50,9 @@ class AgentActionEventPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@AgentActionEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@AgentActionEventPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 new file mode 100644 index 0000000000..fbd42a0103 --- /dev/null +++ b/LiteLoader/include/llapi/mc/AgentActionSystems.hpp @@ -0,0 +1,24 @@ +/** + * @file AgentActionSystems.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace AgentActionSystems { + +#define AFTER_EXTRA + +#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 + */ + 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/AgentDestroyCommandSystem.hpp b/LiteLoader/include/llapi/mc/AgentDestroyCommandSystem.hpp new file mode 100644 index 0000000000..7f26893302 --- /dev/null +++ b/LiteLoader/include/llapi/mc/AgentDestroyCommandSystem.hpp @@ -0,0 +1,43 @@ +/** + * @file AgentDestroyCommandSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class AgentDestroyCommandSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_AGENTDESTROYCOMMANDSYSTEM +public: + class AgentDestroyCommandSystem& operator=(class AgentDestroyCommandSystem const &) = delete; + AgentDestroyCommandSystem(class AgentDestroyCommandSystem const &) = delete; + AgentDestroyCommandSystem() = 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\@AgentDestroyCommandSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + */ + virtual void tick(class EntityRegistry &); + +}; diff --git a/LiteLoader/include/llapi/mc/AgentDestroySystem.hpp b/LiteLoader/include/llapi/mc/AgentDestroySystem.hpp new file mode 100644 index 0000000000..522a793722 --- /dev/null +++ b/LiteLoader/include/llapi/mc/AgentDestroySystem.hpp @@ -0,0 +1,28 @@ +/** + * @file AgentDestroySystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace AgentDestroySystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?initialize\@AgentDestroySystem\@\@YAXAEAVEntityContext\@\@AEBUStateVectorComponent\@\@AEBUMobBodyRotationComponent\@\@AEBUActionDetails\@AgentComponents\@\@AEBVDestroy\@6\@\@Z + */ + MCAPI void initialize(class EntityContext &, struct StateVectorComponent const &, struct MobBodyRotationComponent const &, struct AgentComponents::ActionDetails const &, class AgentComponents::Destroy const &); + /** + * @symbol ?tick\@AgentDestroySystem\@\@YAXAEAVEntityContext\@\@AEBUStateVectorComponent\@\@AEBUMobBodyRotationComponent\@\@AEBUActionDetails\@AgentComponents\@\@AEBVDestroy\@6\@\@Z + */ + MCAPI void tick(class EntityContext &, struct StateVectorComponent const &, struct MobBodyRotationComponent const &, struct AgentComponents::ActionDetails const &, class AgentComponents::Destroy const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/AgentInspectCommandSystem.hpp b/LiteLoader/include/llapi/mc/AgentInspectCommandSystem.hpp new file mode 100644 index 0000000000..7a051052d3 --- /dev/null +++ b/LiteLoader/include/llapi/mc/AgentInspectCommandSystem.hpp @@ -0,0 +1,43 @@ +/** + * @file AgentInspectCommandSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class AgentInspectCommandSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_AGENTINSPECTCOMMANDSYSTEM +public: + class AgentInspectCommandSystem& operator=(class AgentInspectCommandSystem const &) = delete; + AgentInspectCommandSystem(class AgentInspectCommandSystem const &) = delete; + AgentInspectCommandSystem() = 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\@AgentInspectCommandSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + */ + virtual void tick(class EntityRegistry &); + +}; diff --git a/LiteLoader/include/llapi/mc/AgentInteractCommandSystem.hpp b/LiteLoader/include/llapi/mc/AgentInteractCommandSystem.hpp new file mode 100644 index 0000000000..6f034b9ec3 --- /dev/null +++ b/LiteLoader/include/llapi/mc/AgentInteractCommandSystem.hpp @@ -0,0 +1,43 @@ +/** + * @file AgentInteractCommandSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class AgentInteractCommandSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_AGENTINTERACTCOMMANDSYSTEM +public: + class AgentInteractCommandSystem& operator=(class AgentInteractCommandSystem const &) = delete; + AgentInteractCommandSystem(class AgentInteractCommandSystem const &) = delete; + AgentInteractCommandSystem() = 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\@AgentInteractCommandSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + */ + virtual void tick(class EntityRegistry &); + +}; diff --git a/LiteLoader/include/llapi/mc/AgentInteractSystem.hpp b/LiteLoader/include/llapi/mc/AgentInteractSystem.hpp new file mode 100644 index 0000000000..d0010ec338 --- /dev/null +++ b/LiteLoader/include/llapi/mc/AgentInteractSystem.hpp @@ -0,0 +1,28 @@ +/** + * @file AgentInteractSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace AgentInteractSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?initialize\@AgentInteractSystem\@\@YAXAEAVEntityContext\@\@AEBUStateVectorComponent\@\@AEBUMobBodyRotationComponent\@\@AEBUActionDetails\@AgentComponents\@\@AEBVInteract\@6\@\@Z + */ + MCAPI void initialize(class EntityContext &, struct StateVectorComponent const &, struct MobBodyRotationComponent const &, struct AgentComponents::ActionDetails const &, class AgentComponents::Interact const &); + /** + * @symbol ?tick\@AgentInteractSystem\@\@YAXAEAVEntityContext\@\@AEBUStateVectorComponent\@\@AEBUMobBodyRotationComponent\@\@AEBUActionDetails\@AgentComponents\@\@AEBVInteract\@6\@\@Z + */ + MCAPI void tick(class EntityContext &, struct StateVectorComponent const &, struct MobBodyRotationComponent const &, struct AgentComponents::ActionDetails const &, class AgentComponents::Interact const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/AirBlock.hpp b/LiteLoader/include/llapi/mc/AirBlock.hpp index 178bffa853..ddc89134a6 100644 --- a/LiteLoader/include/llapi/mc/AirBlock.hpp +++ b/LiteLoader/include/llapi/mc/AirBlock.hpp @@ -65,16 +65,21 @@ class AirBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -86,10 +91,10 @@ class AirBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -121,10 +126,10 @@ class AirBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -151,170 +156,165 @@ class AirBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 69 + * @vftbl 68 * @symbol ?checkIsPathable\@AirBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 89 + * @vftbl 88 * @symbol ?mayPick\@AirBlock\@\@UEBA_NXZ */ virtual bool mayPick() const; /** - * @vftbl 90 + * @vftbl 89 * @symbol ?mayPick\@AirBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z */ virtual bool mayPick(class BlockSource const &, class Block const &, bool) const; /** - * @vftbl 91 + * @vftbl 90 * @symbol ?mayPlace\@AirBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@AirBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 94 + * @vftbl 93 * @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 97 + * @vftbl 96 * @symbol ?destroy\@AirBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@PEAVActor\@\@\@Z */ virtual void destroy(class BlockSource &, class BlockPos const &, class Block const &, class Actor *) const; /** - * @vftbl 101 + * @vftbl 100 * @symbol ?playerWillDestroy\@AirBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 102 + * @vftbl 101 * @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 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 143 + * @vftbl 141 * @symbol ?getVisualShapeInWorld\@AirBlock\@\@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 144 + * @vftbl 142 * @symbol ?getVisualShape\@AirBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@AirBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@AirBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #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 b3ed0f5091..4e0562b790 100644 --- a/LiteLoader/include/llapi/mc/AirBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/AirBlockItem.hpp @@ -36,11 +36,6 @@ class AirBlockItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class AirBlockItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -101,5 +101,15 @@ class AirBlockItem : public Item { * @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(); }; diff --git a/LiteLoader/include/llapi/mc/Allay.hpp b/LiteLoader/include/llapi/mc/Allay.hpp index bae37780ad..7efaf7635f 100644 --- a/LiteLoader/include/llapi/mc/Allay.hpp +++ b/LiteLoader/include/llapi/mc/Allay.hpp @@ -40,140 +40,135 @@ class Allay : public Mob { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 - */ - virtual void __unk_vfn_260(); - /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@Allay\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@Allay\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 288 + * @vftbl 280 * @symbol ?aiStep\@Allay\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0Allay\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/AllayVibrationConfig.hpp b/LiteLoader/include/llapi/mc/AllayVibrationConfig.hpp index 87f8eb840b..9887255358 100644 --- a/LiteLoader/include/llapi/mc/AllayVibrationConfig.hpp +++ b/LiteLoader/include/llapi/mc/AllayVibrationConfig.hpp @@ -34,9 +34,9 @@ class AllayVibrationConfig { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?onSignalReceive\@AllayVibrationConfig\@\@UEAAXAEAVBlockSource\@\@VBlockPos\@\@AEBVGameEvent\@\@PEAVActor\@\@M3\@Z + * @symbol ?onSignalReceive\@AllayVibrationConfig\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVGameEvent\@\@PEAVActor\@\@MI3\@Z */ - virtual void onSignalReceive(class BlockSource &, class BlockPos, class GameEvent const &, class Actor *, float, class Actor *); + virtual void onSignalReceive(class BlockSource &, class BlockPos const &, class GameEvent const &, class Actor *, float, unsigned int, class Actor *); /** * @vftbl 2 * @symbol ?isValidVibration\@AllayVibrationConfig\@\@UEAA_NAEBVGameEvent\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/AllowedAnywhereConsume.hpp b/LiteLoader/include/llapi/mc/AllowedAnywhereConsume.hpp new file mode 100644 index 0000000000..9beee5d54c --- /dev/null +++ b/LiteLoader/include/llapi/mc/AllowedAnywhereConsume.hpp @@ -0,0 +1,32 @@ +/** + * @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 e1721edb4d..c448203bc4 100644 --- a/LiteLoader/include/llapi/mc/AmethystBlock.hpp +++ b/LiteLoader/include/llapi/mc/AmethystBlock.hpp @@ -45,16 +45,21 @@ class AmethystBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class AmethystBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class AmethystBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,105 +136,100 @@ class AmethystBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_AMETHYSTBLOCK /** * @symbol ?isSilentWhenJumpingOff\@AmethystBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/AmethystBlockUtils.hpp b/LiteLoader/include/llapi/mc/AmethystBlockUtils.hpp index 0e53104453..3e055a4afd 100644 --- a/LiteLoader/include/llapi/mc/AmethystBlockUtils.hpp +++ b/LiteLoader/include/llapi/mc/AmethystBlockUtils.hpp @@ -17,8 +17,8 @@ namespace AmethystBlockUtils { #undef AFTER_EXTRA /** - * @symbol ?resonateVibration\@AmethystBlockUtils\@\@YAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?resonateVibration\@AmethystBlockUtils\@\@YAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@H\@Z */ - MCAPI void resonateVibration(class BlockSource &, class BlockPos const &, int); + MCAPI void resonateVibration(class BlockSource &, class BlockPos const &, class Actor *, int); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/AmethystClusterBlock.hpp b/LiteLoader/include/llapi/mc/AmethystClusterBlock.hpp index a7afede100..01610c9470 100644 --- a/LiteLoader/include/llapi/mc/AmethystClusterBlock.hpp +++ b/LiteLoader/include/llapi/mc/AmethystClusterBlock.hpp @@ -45,16 +45,21 @@ class AmethystClusterBlock : public AmethystBlock { * @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 + */ + virtual void __unk_vfn_28(); /** * @vftbl 29 * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class AmethystClusterBlock : public AmethystBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class AmethystClusterBlock : public AmethystBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,167 +136,162 @@ class AmethystClusterBlock : public AmethystBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 69 + * @vftbl 68 * @symbol ?checkIsPathable\@AmethystClusterBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 91 + * @vftbl 90 * @symbol ?mayPlace\@AmethystClusterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@AmethystClusterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@AmethystClusterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 101 * @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 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@AmethystClusterBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 153 + * @vftbl 151 * @symbol ?init\@AmethystClusterBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@AmethystClusterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@AmethystClusterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 + * @vftbl 187 * @symbol ?playerDestroy\@AmethystClusterBlock\@\@EEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@AmethystClusterBlock\@\@EEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@AmethystClusterBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/AngryComponent.hpp b/LiteLoader/include/llapi/mc/AngryComponent.hpp index 78b28c4c63..3be5bae05d 100644 --- a/LiteLoader/include/llapi/mc/AngryComponent.hpp +++ b/LiteLoader/include/llapi/mc/AngryComponent.hpp @@ -28,14 +28,14 @@ class AngryComponent { #endif public: - /** - * @symbol ??0AngryComponent\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI AngryComponent(class AngryComponent &&); /** * @symbol ??0AngryComponent\@\@QEAA\@XZ */ MCAPI AngryComponent(); + /** + * @symbol ??0AngryComponent\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI AngryComponent(class AngryComponent &&); /** * @symbol ?canGetAngry\@AngryComponent\@\@QEBA_NAEAVMob\@\@PEAV2\@PEAVActor\@\@_N3\@Z */ diff --git a/LiteLoader/include/llapi/mc/Animal.hpp b/LiteLoader/include/llapi/mc/Animal.hpp index 08d6f7d55a..2f120391cd 100644 --- a/LiteLoader/include/llapi/mc/Animal.hpp +++ b/LiteLoader/include/llapi/mc/Animal.hpp @@ -42,145 +42,140 @@ class Animal : public Mob { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 134 + * @vftbl 132 * @symbol ?isInvulnerableTo\@Animal\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@Animal\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 274 + * @vftbl 266 * @symbol ?_onSizeUpdated\@Animal\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 337 + * @vftbl 329 * @symbol ?_getWalkTargetValue\@Animal\@\@MEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); #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 4f0d4a6111..88bae624b3 100644 --- a/LiteLoader/include/llapi/mc/AnimateEntityPacket.hpp +++ b/LiteLoader/include/llapi/mc/AnimateEntityPacket.hpp @@ -51,9 +51,9 @@ class AnimateEntityPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@AnimateEntityPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@AnimateEntityPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 d96be56e69..fe8501466d 100644 --- a/LiteLoader/include/llapi/mc/AnimatePacket.hpp +++ b/LiteLoader/include/llapi/mc/AnimatePacket.hpp @@ -65,23 +65,23 @@ class AnimatePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@AnimatePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@AnimatePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ANIMATEPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~AnimatePacket(); #endif - /** - * @symbol ??0AnimatePacket\@\@QEAA\@XZ - */ - MCAPI AnimatePacket(); /** * @symbol ??0AnimatePacket\@\@QEAA\@W4Action\@0\@AEAVActor\@\@\@Z */ MCAPI AnimatePacket(enum class AnimatePacket::Action, class Actor &); + /** + * @symbol ??0AnimatePacket\@\@QEAA\@XZ + */ + MCAPI AnimatePacket(); /** * @symbol ??0AnimatePacket\@\@QEAA\@W4Action\@0\@VActorRuntimeID\@\@M\@Z */ diff --git a/LiteLoader/include/llapi/mc/AnvilBlock.hpp b/LiteLoader/include/llapi/mc/AnvilBlock.hpp index 0dedf43722..440c0e118f 100644 --- a/LiteLoader/include/llapi/mc/AnvilBlock.hpp +++ b/LiteLoader/include/llapi/mc/AnvilBlock.hpp @@ -5,7 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "HeavyBlock.hpp" +#include "FallingBlock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +16,7 @@ * @brief MC class AnvilBlock. * */ -class AnvilBlock : public HeavyBlock { +class AnvilBlock : public FallingBlock { #define AFTER_EXTRA // Add Member There @@ -50,16 +50,26 @@ class AnvilBlock : public HeavyBlock { * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); + /** + * @vftbl 22 + * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -71,10 +81,10 @@ class AnvilBlock : public HeavyBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +116,10 @@ class AnvilBlock : public HeavyBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,15 +146,15 @@ class AnvilBlock : public HeavyBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -152,161 +162,156 @@ class AnvilBlock : public HeavyBlock { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@AnvilBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 96 + * @vftbl 95 * @symbol ?breaksFallingBlocks\@AnvilBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@AnvilBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@AnvilBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@AnvilBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@AnvilBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@AnvilBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@AnvilBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@AnvilBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 195 + * @vftbl 194 * @symbol ?getDustColor\@AnvilBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 196 + * @vftbl 195 * @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 197 - * @symbol __unk_vfn_197 + * @vftbl 196 + * @symbol __unk_vfn_196 */ - virtual void __unk_vfn_197(); + virtual void __unk_vfn_196(); /** - * @vftbl 198 + * @vftbl 197 * @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 a56a7f8a46..4bab784ec8 100644 --- a/LiteLoader/include/llapi/mc/AnvilDamagePacket.hpp +++ b/LiteLoader/include/llapi/mc/AnvilDamagePacket.hpp @@ -51,9 +51,9 @@ class AnvilDamagePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@AnvilDamagePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@AnvilDamagePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0AnvilDamagePacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/AppPlatform.hpp b/LiteLoader/include/llapi/mc/AppPlatform.hpp index 15a36b5562..b685734c20 100644 --- a/LiteLoader/include/llapi/mc/AppPlatform.hpp +++ b/LiteLoader/include/llapi/mc/AppPlatform.hpp @@ -38,10 +38,6 @@ struct AndroidScopedStorageInfo { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_APPPLATFORM - /** - * @symbol ?_createProxyResolver\@AppPlatform\@\@EEAA?AV?$unique_ptr\@VIProxyResolver\@Http\@Bedrock\@\@U?$default_delete\@VIProxyResolver\@Http\@Bedrock\@\@\@std\@\@\@std\@\@XZ - */ - MCVAPI std::unique_ptr _createProxyResolver(); /** * @symbol ?_disableCPUBoost\@AppPlatform\@\@MEAAXXZ */ @@ -134,14 +130,14 @@ struct AndroidScopedStorageInfo { * @symbol ?createLoggingStorageArea\@AppPlatform\@\@UEAA?AV?$shared_ptr\@VFileStorageArea\@Core\@\@\@std\@\@W4FileAccessType\@Core\@\@AEBVPath\@5\@\@Z */ MCVAPI class std::shared_ptr createLoggingStorageArea(enum class Core::FileAccessType, class Core::Path const &); - /** - * @symbol ?createUserInput\@AppPlatform\@\@UEAAXH\@Z - */ - MCVAPI void createUserInput(int); /** * @symbol ?createUserInput\@AppPlatform\@\@UEAAXXZ */ MCVAPI void createUserInput(); + /** + * @symbol ?createUserInput\@AppPlatform\@\@UEAAXH\@Z + */ + MCVAPI void createUserInput(int); /** * @symbol ?createWebview\@AppPlatform\@\@UEBA?AV?$shared_ptr\@VWebviewInterface\@\@\@std\@\@$$QEAVPlatformArguments\@Webview\@\@\@Z */ @@ -206,6 +202,10 @@ struct AndroidScopedStorageInfo { * @symbol ?getDefaultNetworkMaxPlayers\@AppPlatform\@\@UEBAHXZ */ MCVAPI int getDefaultNetworkMaxPlayers() const; + /** + * @symbol ?getDefaultSafeZoneScaleAll\@AppPlatform\@\@UEBAMXZ + */ + MCVAPI float getDefaultSafeZoneScaleAll() const; /** * @symbol ?getDefaultSafeZoneScaleX\@AppPlatform\@\@UEBAMXZ */ @@ -274,6 +274,10 @@ struct AndroidScopedStorageInfo { * @symbol ?getInternalPackStoragePath\@AppPlatform\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCVAPI class Core::PathBuffer getInternalPackStoragePath() const; + /** + * @symbol ?getIsRunningInAppCenter\@AppPlatform\@\@UEBA_NXZ + */ + MCVAPI bool getIsRunningInAppCenter() const; /** * @symbol ?getLevelInfoCachePath\@AppPlatform\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ @@ -482,6 +486,10 @@ struct AndroidScopedStorageInfo { * @symbol ?hasJournalingFilesystem\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool hasJournalingFilesystem() const; + /** + * @symbol ?hasMulticastReceivePermission\@AppPlatform\@\@UEBA_NXZ + */ + MCVAPI bool hasMulticastReceivePermission() const; /** * @symbol ?hasPlatformSpecificInvites\@AppPlatform\@\@UEBA_NXZ */ @@ -510,6 +518,10 @@ struct AndroidScopedStorageInfo { * @symbol ?initializeGameStreaming\@AppPlatform\@\@UEAAXXZ */ MCVAPI void initializeGameStreaming(); + /** + * @symbol ?initializeMulticast\@AppPlatform\@\@UEBAXXZ + */ + MCVAPI void initializeMulticast() const; /** * @symbol ?initializeScreenDependentResources\@AppPlatform\@\@UEAAXXZ */ @@ -658,6 +670,10 @@ struct AndroidScopedStorageInfo { * @symbol ?notifyNetworkConfigurationChanged\@AppPlatform\@\@UEAAXXZ */ MCVAPI void notifyNetworkConfigurationChanged(); + /** + * @symbol ?onMinecraftGameInitComplete\@AppPlatform\@\@UEAAXXZ + */ + MCVAPI void onMinecraftGameInitComplete(); /** * @symbol ?onPrimaryUserNetworkReady\@AppPlatform\@\@UEAAXXZ */ @@ -678,6 +694,10 @@ struct AndroidScopedStorageInfo { * @symbol ?registerFileForCollectionWithCrashDump\@AppPlatform\@\@UEAAXAEBVPath\@Core\@\@\@Z */ MCVAPI void registerFileForCollectionWithCrashDump(class Core::Path const &); + /** + * @symbol ?releaseMulticastReceivePermission\@AppPlatform\@\@UEBAXXZ + */ + MCVAPI void releaseMulticastReceivePermission() const; /** * @symbol ?reloadRenderResourcesOnResume\@AppPlatform\@\@UEBA_NXZ */ @@ -686,6 +706,10 @@ struct AndroidScopedStorageInfo { * @symbol ?removeListener\@AppPlatform\@\@UEAAXPEAVAppPlatformListener\@\@\@Z */ MCVAPI void removeListener(class AppPlatformListener *); + /** + * @symbol ?requestMulticastReceivePermission\@AppPlatform\@\@UEAAXXZ + */ + MCVAPI void requestMulticastReceivePermission(); /** * @symbol ?requireControllerAtStartup\@AppPlatform\@\@UEBA_NXZ */ @@ -919,10 +943,6 @@ struct AndroidScopedStorageInfo { * @symbol ?getPlatformRuntimeInformation\@AppPlatform\@\@QEBAAEBV?$unique_ptr\@UPlatformRuntimeInfo\@Bedrock\@\@U?$default_delete\@UPlatformRuntimeInfo\@Bedrock\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr const & getPlatformRuntimeInformation() const; - /** - * @symbol ?getProxyResolver\@AppPlatform\@\@QEAA?AV?$not_null\@V?$NonOwnerPointer\@VIProxyResolver\@Http\@Bedrock\@\@\@Bedrock\@\@\@gsl\@\@XZ - */ - MCAPI class gsl::not_null> getProxyResolver(); /** * @symbol ?getScratchPath\@AppPlatform\@\@QEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/AppPlatform_win32.hpp b/LiteLoader/include/llapi/mc/AppPlatform_win32.hpp index cca01b89d0..c315acbc02 100644 --- a/LiteLoader/include/llapi/mc/AppPlatform_win32.hpp +++ b/LiteLoader/include/llapi/mc/AppPlatform_win32.hpp @@ -154,6 +154,10 @@ class AppPlatform_win32 { * @symbol ?hasFastAlphaTest\@AppPlatform_win32\@\@UEBA_NXZ */ MCVAPI bool hasFastAlphaTest() const; + /** + * @symbol ?hideSplashScreen\@AppPlatform_win32\@\@UEAAXXZ + */ + MCVAPI void hideSplashScreen(); /** * @symbol ?isCentennial\@AppPlatform_win32\@\@UEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/AreaEffectCloud.hpp b/LiteLoader/include/llapi/mc/AreaEffectCloud.hpp index fa2e1bd120..80bca727d6 100644 --- a/LiteLoader/include/llapi/mc/AreaEffectCloud.hpp +++ b/LiteLoader/include/llapi/mc/AreaEffectCloud.hpp @@ -41,130 +41,125 @@ class AreaEffectCloud : public Actor { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@AreaEffectCloud\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 80 + * @vftbl 78 * @symbol ?getShadowRadius\@AreaEffectCloud\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 119 + * @vftbl 117 * @symbol ?setOwner\@AreaEffectCloud\@\@UEAAXUActorUniqueID\@\@\@Z */ virtual void setOwner(struct ActorUniqueID); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@AreaEffectCloud\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@AreaEffectCloud\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** * @symbol ??0AreaEffectCloud\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ArmorItem.hpp b/LiteLoader/include/llapi/mc/ArmorItem.hpp index b87afb8504..867ec97aac 100644 --- a/LiteLoader/include/llapi/mc/ArmorItem.hpp +++ b/LiteLoader/include/llapi/mc/ArmorItem.hpp @@ -43,11 +43,6 @@ class ArmorMaterial { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -73,6 +68,11 @@ class ArmorMaterial { * @symbol ?isDyeable\@ArmorItem\@\@UEBA_NXZ */ virtual bool isDyeable() const; + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -209,12 +209,22 @@ class ArmorMaterial { */ virtual enum class LevelSoundEvent getEquipSound() const; /** - * @vftbl 118 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 120 * @symbol ?getIconInfo\@ArmorItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 133 + * @vftbl 135 * @symbol ?getArmorKnockbackResistance\@ArmorItem\@\@UEBAMXZ */ virtual float getArmorKnockbackResistance() const; @@ -222,6 +232,10 @@ class ArmorMaterial { * @symbol ??0ArmorItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVArmorMaterial\@0\@HW4ArmorSlot\@\@_N\@Z */ MCAPI ArmorItem(std::string const &, int, class ArmorItem::ArmorMaterial const &, int, enum class ArmorSlot, bool); + /** + * @symbol ?isTrimAllowed\@ArmorItem\@\@QEBA_NXZ + */ + MCAPI bool isTrimAllowed() const; /** * @symbol ?CHAIN\@ArmorItem\@\@2VArmorMaterial\@1\@B */ diff --git a/LiteLoader/include/llapi/mc/ArmorItemComponent.hpp b/LiteLoader/include/llapi/mc/ArmorItemComponent.hpp index 522f4c8bce..9ec356aff7 100644 --- a/LiteLoader/include/llapi/mc/ArmorItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/ArmorItemComponent.hpp @@ -51,16 +51,11 @@ class ArmorItemComponent { virtual void __unk_vfn_3(); /** * @vftbl 4 - * @symbol __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 * @symbol ?buildNetworkTag\@?$NetworkedItemComponent\@VArmorItemComponent\@\@\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 5 * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VArmorItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/ArmorStand.hpp b/LiteLoader/include/llapi/mc/ArmorStand.hpp index cf89ed901e..9d788db3b5 100644 --- a/LiteLoader/include/llapi/mc/ArmorStand.hpp +++ b/LiteLoader/include/llapi/mc/ArmorStand.hpp @@ -43,185 +43,180 @@ struct Pose { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@ArmorStand\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 80 + * @vftbl 78 * @symbol ?getShadowRadius\@ArmorStand\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_80(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_86(); /** - * @vftbl 95 + * @vftbl 93 * @symbol ?isPickable\@ArmorStand\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_94(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_97(); + /** + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 134 + * @vftbl 132 * @symbol ?isInvulnerableTo\@ArmorStand\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 230 + * @vftbl 222 * @symbol ?getInteraction\@ArmorStand\@\@UEAA_NAEAVPlayer\@\@AEAVActorInteraction\@\@AEBVVec3\@\@\@Z */ virtual bool getInteraction(class Player &, class ActorInteraction &, class Vec3 const &); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 244 + * @vftbl 236 * @symbol ?kill\@ArmorStand\@\@UEAAXXZ */ virtual void kill(); /** - * @vftbl 245 + * @vftbl 237 * @symbol ?die\@ArmorStand\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 258 + * @vftbl 250 * @symbol ?updateEntitySpecificMolangVariables\@ArmorStand\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@ArmorStand\@\@UEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@ArmorStand\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@ArmorStand\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 290 + * @vftbl 282 * @symbol ?pushActors\@ArmorStand\@\@UEAAXXZ */ virtual void pushActors(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ARMORSTAND /** * @symbol ?interactPreventDefault\@ArmorStand\@\@UEAA_NXZ diff --git a/LiteLoader/include/llapi/mc/ArmorStandItem.hpp b/LiteLoader/include/llapi/mc/ArmorStandItem.hpp index fc39fbe2a3..742d2f684a 100644 --- a/LiteLoader/include/llapi/mc/ArmorStandItem.hpp +++ b/LiteLoader/include/llapi/mc/ArmorStandItem.hpp @@ -36,11 +36,6 @@ class ArmorStandItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class ArmorStandItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -102,7 +102,17 @@ class ArmorStandItem : public Item { */ virtual void __unk_vfn_80(); /** - * @vftbl 132 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 134 * @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/ArmorTrim.hpp b/LiteLoader/include/llapi/mc/ArmorTrim.hpp index 46a54b780f..34639494d0 100644 --- a/LiteLoader/include/llapi/mc/ArmorTrim.hpp +++ b/LiteLoader/include/llapi/mc/ArmorTrim.hpp @@ -73,12 +73,12 @@ class ArmorTrim { */ MCAPI static void appendUpgradeHoverText(class ItemStackBase const &, class Level &, std::string &); /** - * @symbol ?getTrim\@ArmorTrim\@\@SA?AV?$optional\@VArmorTrim\@\@\@std\@\@VBaseGameVersion\@\@VExperiments\@\@AEBVItemStackBase\@\@\@Z + * @symbol ?getTrim\@ArmorTrim\@\@SA?AV?$optional\@VArmorTrim\@\@\@std\@\@AEBVItemStackBase\@\@\@Z */ - MCAPI static class std::optional getTrim(class BaseGameVersion, class Experiments, class ItemStackBase const &); + MCAPI static class std::optional getTrim(class ItemStackBase const &); /** - * @symbol ?setTrim\@ArmorTrim\@\@SAXVBaseGameVersion\@\@VExperiments\@\@AEAVItemStackBase\@\@V1\@\@Z + * @symbol ?setTrim\@ArmorTrim\@\@SAXAEAVItemStackBase\@\@V1\@\@Z */ - MCAPI static void setTrim(class BaseGameVersion, class Experiments, class ItemStackBase &, class ArmorTrim); + MCAPI static void setTrim(class ItemStackBase &, class ArmorTrim); }; diff --git a/LiteLoader/include/llapi/mc/ArmorTrimIconGenerationInfo.hpp b/LiteLoader/include/llapi/mc/ArmorTrimIconGenerationInfo.hpp index 8cf3b7fa15..e9293368cc 100644 --- a/LiteLoader/include/llapi/mc/ArmorTrimIconGenerationInfo.hpp +++ b/LiteLoader/include/llapi/mc/ArmorTrimIconGenerationInfo.hpp @@ -24,22 +24,6 @@ class ArmorTrimIconGenerationInfo { #endif public: - /** - * @symbol ?ARMOR_LOCATION_ROOT\@ArmorTrimIconGenerationInfo\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B - */ - MCAPI static std::string const ARMOR_LOCATION_ROOT; - /** - * @symbol ?PALETTE_LOCATION_ROOT\@ArmorTrimIconGenerationInfo\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B - */ - MCAPI static std::string const PALETTE_LOCATION_ROOT; - /** - * @symbol ?TRIMMED_ARMOR_SUBSTR\@ArmorTrimIconGenerationInfo\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B - */ - MCAPI static std::string const TRIMMED_ARMOR_SUBSTR; - /** - * @symbol ?TRIM_LOCATION_ROOT\@ArmorTrimIconGenerationInfo\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B - */ - MCAPI static std::string const TRIM_LOCATION_ROOT; /** * @symbol ?buildTrimmedArmorName\@ArmorTrimIconGenerationInfo\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@0\@Z */ diff --git a/LiteLoader/include/llapi/mc/Arrow.hpp b/LiteLoader/include/llapi/mc/Arrow.hpp index fd26122108..5465800c67 100644 --- a/LiteLoader/include/llapi/mc/Arrow.hpp +++ b/LiteLoader/include/llapi/mc/Arrow.hpp @@ -42,152 +42,147 @@ class Arrow : public AbstractArrow { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@Arrow\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 - */ - virtual void __unk_vfn_88(); - /** - * @vftbl 89 + * @vftbl 87 * @symbol ?playerTouch\@Arrow\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void playerTouch(class Player &); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 + */ + virtual void __unk_vfn_94(); + /** + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 - */ - virtual void __unk_vfn_218(); - /** - * @vftbl 232 + * @vftbl 224 * @symbol ?setAuxValue\@Arrow\@\@UEAAXH\@Z */ virtual void setAuxValue(int); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@Arrow\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@Arrow\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 276 + * @vftbl 268 * @symbol ?shoot\@Arrow\@\@UEAAXAEBVVec3\@\@MM0\@Z */ virtual void shoot(class Vec3 const &, float, float, class Vec3 const &); /** - * @vftbl 278 + * @vftbl 270 * @symbol ?_getPickupItem\@Arrow\@\@MEBA?AVItemStack\@\@XZ */ virtual class ItemStack _getPickupItem() const; /** - * @vftbl 279 + * @vftbl 271 * @symbol ?applyParticleColor\@Arrow\@\@MEAAXPEAVParticle\@\@\@Z */ virtual void applyParticleColor(class Particle *); /** - * @vftbl 280 + * @vftbl 272 * @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 078686a0ff..492a37cf53 100644 --- a/LiteLoader/include/llapi/mc/ArrowItem.hpp +++ b/LiteLoader/include/llapi/mc/ArrowItem.hpp @@ -36,11 +36,6 @@ class ArrowItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class ArrowItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -127,12 +127,22 @@ class ArrowItem : public Item { */ virtual std::string buildEffectDescriptionName(class ItemStackBase const &) const; /** - * @vftbl 117 + * @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\@ArrowItem\@\@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 118 + * @vftbl 120 * @symbol ?getIconInfo\@ArrowItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; diff --git a/LiteLoader/include/llapi/mc/AttributeInstance.hpp b/LiteLoader/include/llapi/mc/AttributeInstance.hpp index 572ea66c23..0f35478718 100644 --- a/LiteLoader/include/llapi/mc/AttributeInstance.hpp +++ b/LiteLoader/include/llapi/mc/AttributeInstance.hpp @@ -100,14 +100,14 @@ class AttributeInstance { * @symbol ?getModifiers\@AttributeInstance\@\@QEBA?AV?$vector\@VAttributeModifier\@\@V?$allocator\@VAttributeModifier\@\@\@std\@\@\@std\@\@H\@Z */ MCAPI std::vector getModifiers(int) const; - /** - * @symbol ?hasModifier\@AttributeInstance\@\@QEBA_NV?$shared_ptr\@VAttributeModifier\@\@\@std\@\@\@Z - */ - MCAPI bool hasModifier(class std::shared_ptr) const; /** * @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 */ diff --git a/LiteLoader/include/llapi/mc/AttributeModifier.hpp b/LiteLoader/include/llapi/mc/AttributeModifier.hpp index 208bd0a2d6..b3cec94e81 100644 --- a/LiteLoader/include/llapi/mc/AttributeModifier.hpp +++ b/LiteLoader/include/llapi/mc/AttributeModifier.hpp @@ -65,10 +65,6 @@ 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\@XZ */ @@ -77,6 +73,10 @@ 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/AutomationClientConnectPacket.hpp b/LiteLoader/include/llapi/mc/AutomationClientConnectPacket.hpp index fb9d0ef0c6..791737396b 100644 --- a/LiteLoader/include/llapi/mc/AutomationClientConnectPacket.hpp +++ b/LiteLoader/include/llapi/mc/AutomationClientConnectPacket.hpp @@ -51,9 +51,9 @@ class AutomationClientConnectPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@AutomationClientConnectPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@AutomationClientConnectPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_AUTOMATIONCLIENTCONNECTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/AutonomousActorManager.hpp b/LiteLoader/include/llapi/mc/AutonomousActorManager.hpp index 29779766cc..fe5c2a5c93 100644 --- a/LiteLoader/include/llapi/mc/AutonomousActorManager.hpp +++ b/LiteLoader/include/llapi/mc/AutonomousActorManager.hpp @@ -21,13 +21,14 @@ class AutonomousActorManager { public: class AutonomousActorManager& operator=(class AutonomousActorManager const &) = delete; AutonomousActorManager(class AutonomousActorManager const &) = delete; + AutonomousActorManager() = delete; #endif public: /** - * @symbol ??0AutonomousActorManager\@\@QEAA\@XZ + * @symbol ??0AutonomousActorManager\@\@QEAA\@V?$WeakRefT\@UEntityRegistryRefTraits\@\@\@\@\@Z */ - MCAPI AutonomousActorManager(); + MCAPI AutonomousActorManager(class WeakRefT); /** * @symbol ?addAutonomousActorEntity\@AutonomousActorManager\@\@QEAAPEAVActor\@\@AEAVDimension\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z */ @@ -56,10 +57,22 @@ class AutonomousActorManager { * @symbol ?onChunkLoaded\@AutonomousActorManager\@\@QEAAXAEAVLevelChunk\@\@\@Z */ MCAPI void onChunkLoaded(class LevelChunk &); + /** + * @symbol ?registerLevelStorageManagerListener\@AutonomousActorManager\@\@QEAAXAEAVLevelStorageManager\@\@\@Z + */ + MCAPI void registerLevelStorageManagerListener(class LevelStorageManager &); /** * @symbol ??1AutonomousActorManager\@\@QEAA\@XZ */ MCAPI ~AutonomousActorManager(); + /** + * @symbol ?AUTONOMOUS_ACTOR_KEY\@AutonomousActorManager\@\@2V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B + */ + MCAPI static class std::basic_string_view> const AUTONOMOUS_ACTOR_KEY; + /** + * @symbol ?AUTONOMOUS_ACTOR_LIST_KEY\@AutonomousActorManager\@\@2V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B + */ + MCAPI static class std::basic_string_view> const AUTONOMOUS_ACTOR_LIST_KEY; //private: /** @@ -70,6 +83,10 @@ class AutonomousActorManager { * @symbol ?_onRemoveActorEntityReferences\@AutonomousActorManager\@\@AEAAXAEAVActor\@\@\@Z */ MCAPI void _onRemoveActorEntityReferences(class Actor &); + /** + * @symbol ?_saveAllAutonomousActors\@AutonomousActorManager\@\@AEAAXAEAVLevelStorage\@\@\@Z + */ + MCAPI void _saveAllAutonomousActors(class LevelStorage &); private: diff --git a/LiteLoader/include/llapi/mc/AuxDataBlockItem.hpp b/LiteLoader/include/llapi/mc/AuxDataBlockItem.hpp index f03d3686c7..19ddc8af3d 100644 --- a/LiteLoader/include/llapi/mc/AuxDataBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/AuxDataBlockItem.hpp @@ -36,11 +36,6 @@ class AuxDataBlockItem : public BlockItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class AuxDataBlockItem : public BlockItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 45 * @symbol ?getLevelDataForAuxValue\@AuxDataBlockItem\@\@UEBAHH\@Z @@ -111,6 +111,16 @@ class AuxDataBlockItem : public BlockItem { * @symbol ?buildDescriptionId\@AuxDataBlockItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); /** * @symbol ??0AuxDataBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HPEBVBlock\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/AvailableActorIdentifiersPacket.hpp b/LiteLoader/include/llapi/mc/AvailableActorIdentifiersPacket.hpp index 57a373fc94..884e3ae383 100644 --- a/LiteLoader/include/llapi/mc/AvailableActorIdentifiersPacket.hpp +++ b/LiteLoader/include/llapi/mc/AvailableActorIdentifiersPacket.hpp @@ -51,27 +51,27 @@ class AvailableActorIdentifiersPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 4 - * @symbol ?readExtended\@AvailableActorIdentifiersPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@AvailableActorIdentifiersPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult read(class ReadOnlyBinaryStream &); /** * @vftbl 7 - * @symbol ?_read\@AvailableActorIdentifiersPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@AvailableActorIdentifiersPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_AVAILABLEACTORIDENTIFIERSPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~AvailableActorIdentifiersPacket(); #endif - /** - * @symbol ??0AvailableActorIdentifiersPacket\@\@QEAA\@AEBV?$vector\@UActorInfo\@\@V?$allocator\@UActorInfo\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI AvailableActorIdentifiersPacket(std::vector const &); /** * @symbol ??0AvailableActorIdentifiersPacket\@\@QEAA\@XZ */ MCAPI AvailableActorIdentifiersPacket(); + /** + * @symbol ??0AvailableActorIdentifiersPacket\@\@QEAA\@AEBV?$vector\@UActorInfo\@\@V?$allocator\@UActorInfo\@\@\@std\@\@\@std\@\@\@Z + */ + MCAPI AvailableActorIdentifiersPacket(std::vector const &); }; diff --git a/LiteLoader/include/llapi/mc/AvailableCommandsPacket.hpp b/LiteLoader/include/llapi/mc/AvailableCommandsPacket.hpp index 7832ea4a07..03f7b45031 100644 --- a/LiteLoader/include/llapi/mc/AvailableCommandsPacket.hpp +++ b/LiteLoader/include/llapi/mc/AvailableCommandsPacket.hpp @@ -38,6 +38,8 @@ class AvailableCommandsPacket : public Packet { { std::string desc; unsigned int sym; + bool optional; + char paramOptions; }; struct OverloadData { @@ -149,9 +151,9 @@ inline std::vector getSoftEnumValues(std::string const& name) virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@AvailableCommandsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@AvailableCommandsPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_AVAILABLECOMMANDSPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/Axolotl.hpp b/LiteLoader/include/llapi/mc/Axolotl.hpp index db3f17cbab..9b57dbc422 100644 --- a/LiteLoader/include/llapi/mc/Axolotl.hpp +++ b/LiteLoader/include/llapi/mc/Axolotl.hpp @@ -42,132 +42,127 @@ class Axolotl : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_267(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_293(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_297(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 - */ - virtual void __unk_vfn_305(); - /** - * @vftbl 337 + * @vftbl 329 * @symbol ?_getWalkTargetValue\@Axolotl\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** - * @vftbl 352 + * @vftbl 344 * @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 8d2e61ff9d..1e52a6451e 100644 --- a/LiteLoader/include/llapi/mc/AzaleaBlock.hpp +++ b/LiteLoader/include/llapi/mc/AzaleaBlock.hpp @@ -5,7 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "BlockLegacy.hpp" +#include "BushBlock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +16,7 @@ * @brief MC class AzaleaBlock. * */ -class AzaleaBlock : public BlockLegacy { +class AzaleaBlock : public BushBlock { #define AFTER_EXTRA // Add Member There @@ -50,16 +50,21 @@ class AzaleaBlock : public BlockLegacy { * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -72,14 +77,14 @@ class AzaleaBlock : public BlockLegacy { virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol __unk_vfn_34 + * @symbol ?isWaterBlocking\@AzaleaBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_34(); + virtual bool isWaterBlocking() const; /** * @vftbl 35 - * @symbol ?isWaterBlocking\@AzaleaBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_35 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -111,10 +116,10 @@ class AzaleaBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -141,120 +146,115 @@ class AzaleaBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@AzaleaBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@AzaleaBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 93 + * @vftbl 92 * @symbol ?mayPlaceOn\@AzaleaBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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/AzaleaLeafBlock.hpp b/LiteLoader/include/llapi/mc/AzaleaLeafBlock.hpp deleted file mode 100644 index b61f8bf314..0000000000 --- a/LiteLoader/include/llapi/mc/AzaleaLeafBlock.hpp +++ /dev/null @@ -1,268 +0,0 @@ -/** - * @file AzaleaLeafBlock.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "LeafBlock.hpp" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class AzaleaLeafBlock. - * - */ -class AzaleaLeafBlock : public LeafBlock { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_AZALEALEAFBLOCK -public: - class AzaleaLeafBlock& operator=(class AzaleaLeafBlock const &) = delete; - AzaleaLeafBlock(class AzaleaLeafBlock const &) = delete; - AzaleaLeafBlock() = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); - /** - * @vftbl 30 - * @symbol __unk_vfn_30 - */ - virtual void __unk_vfn_30(); - /** - * @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 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 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 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 60 - * @symbol __unk_vfn_60 - */ - virtual void __unk_vfn_60(); - /** - * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 75 - * @symbol __unk_vfn_75 - */ - virtual void __unk_vfn_75(); - /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 105 - * @symbol __unk_vfn_105 - */ - virtual void __unk_vfn_105(); - /** - * @vftbl 123 - * @symbol __unk_vfn_123 - */ - virtual void __unk_vfn_123(); - /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 - */ - virtual void __unk_vfn_126(); - /** - * @vftbl 129 - * @symbol __unk_vfn_129 - */ - virtual void __unk_vfn_129(); - /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 137 - * @symbol ?getColor\@AzaleaLeafBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z - */ - virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; - /** - * @vftbl 141 - * @symbol ?onGraphicsModeChanged\@AzaleaLeafBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z - */ - virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); - /** - * @vftbl 147 - * @symbol ?getVariant\@AzaleaLeafBlock\@\@UEBAHAEBVBlock\@\@\@Z - */ - virtual int getVariant(class Block const &) const; - /** - * @vftbl 157 - * @symbol __unk_vfn_157 - */ - virtual void __unk_vfn_157(); - /** - * @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 171 - * @symbol __unk_vfn_171 - */ - virtual void __unk_vfn_171(); - /** - * @vftbl 175 - * @symbol __unk_vfn_175 - */ - virtual void __unk_vfn_175(); - /** - * @vftbl 179 - * @symbol __unk_vfn_179 - */ - virtual void __unk_vfn_179(); - /** - * @vftbl 182 - * @symbol ?getRenderLayer\@AzaleaLeafBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 186 - * @symbol ?getMapColor\@AzaleaLeafBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z - */ - virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; - /** - * @vftbl 187 - * @symbol __unk_vfn_187 - */ - virtual void __unk_vfn_187(); - /** - * @vftbl 189 - * @symbol ?getResourceItem\@AzaleaLeafBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z - */ - virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; - /** - * @vftbl 191 - * @symbol ?getSilkTouchItemInstance\@AzaleaLeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z - */ - virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; - /** - * @symbol ??0AzaleaLeafBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HV?$WeakPtr\@VBlockLegacy\@\@\@\@\@Z - */ - MCAPI AzaleaLeafBlock(std::string const &, int, class WeakPtr); - -}; diff --git a/LiteLoader/include/llapi/mc/AzaleaLeavesBlock.hpp b/LiteLoader/include/llapi/mc/AzaleaLeavesBlock.hpp new file mode 100644 index 0000000000..a26bcad11b --- /dev/null +++ b/LiteLoader/include/llapi/mc/AzaleaLeavesBlock.hpp @@ -0,0 +1,263 @@ +/** + * @file AzaleaLeavesBlock.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "LeavesBlock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class AzaleaLeavesBlock : public LeavesBlock { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_AZALEALEAVESBLOCK +public: + class AzaleaLeavesBlock& operator=(class AzaleaLeavesBlock const &) = delete; + AzaleaLeavesBlock(class AzaleaLeavesBlock const &) = delete; + AzaleaLeavesBlock() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + 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(); + /** + * @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 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 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 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @vftbl 59 + * @symbol __unk_vfn_59 + */ + virtual void __unk_vfn_59(); + /** + * @vftbl 60 + * @symbol __unk_vfn_60 + */ + virtual void __unk_vfn_60(); + /** + * @vftbl 74 + * @symbol __unk_vfn_74 + */ + virtual void __unk_vfn_74(); + /** + * @vftbl 81 + * @symbol __unk_vfn_81 + */ + virtual void __unk_vfn_81(); + /** + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); + /** + * @vftbl 123 + * @symbol __unk_vfn_123 + */ + virtual void __unk_vfn_123(); + /** + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 + */ + virtual void __unk_vfn_127(); + /** + * @vftbl 130 + * @symbol __unk_vfn_130 + */ + virtual void __unk_vfn_130(); + /** + * @vftbl 135 + * @symbol ?getColor\@AzaleaLeavesBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + */ + virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; + /** + * @vftbl 139 + * @symbol ?onGraphicsModeChanged\@AzaleaLeavesBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z + */ + virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); + /** + * @vftbl 145 + * @symbol ?getVariant\@AzaleaLeavesBlock\@\@UEBAHAEBVBlock\@\@\@Z + */ + virtual int getVariant(class Block const &) const; + /** + * @vftbl 155 + * @symbol __unk_vfn_155 + */ + virtual void __unk_vfn_155(); + /** + * @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 180 + * @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 + * @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 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@AzaleaLeavesBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + */ + virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + /** + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@AzaleaLeavesBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + */ + virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; + /** + * @symbol ??0AzaleaLeavesBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HV?$WeakPtr\@VBlockLegacy\@\@\@\@\@Z + */ + MCAPI AzaleaLeavesBlock(std::string const &, int, class WeakPtr); + +}; diff --git a/LiteLoader/include/llapi/mc/Balloon.hpp b/LiteLoader/include/llapi/mc/Balloon.hpp index 6ce2e74c19..c7150d2124 100644 --- a/LiteLoader/include/llapi/mc/Balloon.hpp +++ b/LiteLoader/include/llapi/mc/Balloon.hpp @@ -47,115 +47,110 @@ class Balloon : public PredictableProjectile { */ virtual void remove(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 - */ - virtual void __unk_vfn_88(); - /** - * @vftbl 95 + * @vftbl 93 * @symbol ?isPickable\@Balloon\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 + */ + virtual void __unk_vfn_94(); + /** + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@Balloon\@\@UEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** * @symbol ??0Balloon\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BalloonItem.hpp b/LiteLoader/include/llapi/mc/BalloonItem.hpp index 43473154ee..4588cc0ee9 100644 --- a/LiteLoader/include/llapi/mc/BalloonItem.hpp +++ b/LiteLoader/include/llapi/mc/BalloonItem.hpp @@ -36,11 +36,6 @@ class BalloonItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -61,6 +56,11 @@ class BalloonItem : public Item { * @symbol ?isDyeable\@BalloonItem\@\@UEBA_NXZ */ virtual bool isDyeable() const; + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -117,7 +117,17 @@ class BalloonItem : public Item { */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 132 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 134 * @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 c85bbbca2f..39cecfbc3e 100644 --- a/LiteLoader/include/llapi/mc/BambooItem.hpp +++ b/LiteLoader/include/llapi/mc/BambooItem.hpp @@ -31,11 +31,6 @@ class BambooItem : public BlockItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -51,6 +46,11 @@ class BambooItem : public BlockItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 45 * @symbol ?getLevelDataForAuxValue\@BambooItem\@\@UEBAHH\@Z @@ -102,7 +102,17 @@ class BambooItem : public BlockItem { */ virtual void __unk_vfn_80(); /** - * @vftbl 132 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 134 * @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 19b658f9b6..98cc56629d 100644 --- a/LiteLoader/include/llapi/mc/BambooSaplingBlock.hpp +++ b/LiteLoader/include/llapi/mc/BambooSaplingBlock.hpp @@ -5,14 +5,14 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Sapling.hpp" +#include "SaplingBlock.hpp" #define BEFORE_EXTRA #undef BEFORE_EXTRA -class BambooSaplingBlock : public Sapling { +class BambooSaplingBlock : public SaplingBlock { #define AFTER_EXTRA @@ -40,16 +40,21 @@ class BambooSaplingBlock : public Sapling { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class BambooSaplingBlock : public Sapling { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class BambooSaplingBlock : public Sapling { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,20 +131,20 @@ class BambooSaplingBlock : public Sapling { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** * @vftbl 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 55 * @symbol ?isValidAuxValue\@BambooSaplingBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; + /** + * @vftbl 59 + * @symbol __unk_vfn_59 + */ + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -147,151 +152,146 @@ class BambooSaplingBlock : public Sapling { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@BambooSaplingBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@BambooSaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@BambooSaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@BambooSaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@BambooSaplingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@BambooSaplingBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@BambooSaplingBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@BambooSaplingBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 173 + * @vftbl 171 * @symbol ?randomTick\@BambooSaplingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@BambooSaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 + * @vftbl 187 * @symbol ?playerDestroy\@BambooSaplingBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@BambooSaplingBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @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 af8d1d6564..2d8d54f580 100644 --- a/LiteLoader/include/llapi/mc/BambooStalkBlock.hpp +++ b/LiteLoader/include/llapi/mc/BambooStalkBlock.hpp @@ -45,16 +45,21 @@ class BambooStalkBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -67,14 +72,14 @@ class BambooStalkBlock : public BlockLegacy { virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol __unk_vfn_34 + * @symbol ?isWaterBlocking\@BambooStalkBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_34(); + virtual bool isWaterBlocking() const; /** * @vftbl 35 - * @symbol ?isWaterBlocking\@BambooStalkBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_35 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +111,10 @@ class BambooStalkBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,20 +141,20 @@ class BambooStalkBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** * @vftbl 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 55 * @symbol ?isValidAuxValue\@BambooStalkBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; + /** + * @vftbl 59 + * @symbol __unk_vfn_59 + */ + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -157,151 +162,146 @@ class BambooStalkBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@BambooStalkBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@BambooStalkBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 86 * @symbol ?mayConsumeFertilizer\@BambooStalkBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@BambooStalkBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 - * @symbol ?mayPlace\@BambooStalkBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 91 + * @symbol ?mayPlace\@BambooStalkBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@BambooStalkBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@BambooStalkBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@BambooStalkBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@BambooStalkBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 + * @vftbl 171 * @symbol ?randomTick\@BambooStalkBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@BambooStalkBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 + * @vftbl 187 * @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/BannerAddPatternRecipe.hpp b/LiteLoader/include/llapi/mc/BannerAddPatternRecipe.hpp index 5f811a126b..a21f67146f 100644 --- a/LiteLoader/include/llapi/mc/BannerAddPatternRecipe.hpp +++ b/LiteLoader/include/llapi/mc/BannerAddPatternRecipe.hpp @@ -38,9 +38,9 @@ class BannerAddPatternRecipe : public Recipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@BannerAddPatternRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z + * @symbol ?assemble\@BannerAddPatternRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEAVCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; + virtual std::vector const & assemble(class CraftingContainer &, class CraftingContext &) const; /** * @vftbl 2 * @symbol ?getCraftingSize\@BannerAddPatternRecipe\@\@UEBAHXZ @@ -63,9 +63,9 @@ class BannerAddPatternRecipe : public Recipe { virtual void __unk_vfn_5(); /** * @vftbl 6 - * @symbol ?matches\@BannerAddPatternRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @symbol ?matches\@BannerAddPatternRecipe\@\@UEBA_NAEBVCraftingContainer\@\@AEBVCraftingContext\@\@\@Z */ - virtual bool matches(class CraftingContainer &, class Level &) const; + virtual bool matches(class CraftingContainer const &, class CraftingContext const &) const; /** * @vftbl 7 * @symbol ?size\@BannerAddPatternRecipe\@\@UEBAHXZ @@ -80,9 +80,9 @@ class BannerAddPatternRecipe : public Recipe { */ MCAPI BannerAddPatternRecipe(class std::basic_string_view>); /** - * @symbol ?matchPatterns\@BannerAddPatternRecipe\@\@QEBA?BV?$NonOwnerPointer\@$$CBVBannerPattern\@\@\@Bedrock\@\@AEAVCraftingContainer\@\@\@Z + * @symbol ?matchPatterns\@BannerAddPatternRecipe\@\@QEBA?BV?$NonOwnerPointer\@$$CBVBannerPattern\@\@\@Bedrock\@\@AEBVCraftingContainer\@\@\@Z */ - MCAPI class Bedrock::NonOwnerPointer const matchPatterns(class CraftingContainer &) const; + MCAPI class Bedrock::NonOwnerPointer const matchPatterns(class CraftingContainer const &) const; /** * @symbol ?ID\@BannerAddPatternRecipe\@\@2VUUID\@mce\@\@B */ diff --git a/LiteLoader/include/llapi/mc/BannerBlock.hpp b/LiteLoader/include/llapi/mc/BannerBlock.hpp index 6b2079c29c..1bd659e2ee 100644 --- a/LiteLoader/include/llapi/mc/BannerBlock.hpp +++ b/LiteLoader/include/llapi/mc/BannerBlock.hpp @@ -45,16 +45,21 @@ class BannerBlock : public ActorBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class BannerBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class BannerBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,152 +136,147 @@ class BannerBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 69 + * @vftbl 68 * @symbol ?checkIsPathable\@BannerBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@BannerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 101 + * @vftbl 100 * @symbol ?playerWillDestroy\@BannerBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@BannerBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@BannerBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@BannerBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@BannerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@BannerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@BannerBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 195 + * @vftbl 194 * @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 f9cba5577a..fdf15d3b31 100644 --- a/LiteLoader/include/llapi/mc/BannerBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BannerBlockActor.hpp @@ -91,17 +91,17 @@ class BannerBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); /** - * @vftbl 37 + * @vftbl 39 * @symbol ?_getUpdatePacket\@BannerBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 38 + * @vftbl 40 * @symbol ?_onUpdatePacket\@BannerBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/BannerDuplicateRecipe.hpp b/LiteLoader/include/llapi/mc/BannerDuplicateRecipe.hpp index 0398f5a801..404fe9065c 100644 --- a/LiteLoader/include/llapi/mc/BannerDuplicateRecipe.hpp +++ b/LiteLoader/include/llapi/mc/BannerDuplicateRecipe.hpp @@ -37,9 +37,9 @@ class BannerDuplicateRecipe : public Recipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@BannerDuplicateRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z + * @symbol ?assemble\@BannerDuplicateRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEAVCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; + virtual std::vector const & assemble(class CraftingContainer &, class CraftingContext &) const; /** * @vftbl 2 * @symbol ?getCraftingSize\@BannerDuplicateRecipe\@\@UEBAHXZ @@ -62,9 +62,9 @@ class BannerDuplicateRecipe : public Recipe { virtual void __unk_vfn_5(); /** * @vftbl 6 - * @symbol ?matches\@BannerDuplicateRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @symbol ?matches\@BannerDuplicateRecipe\@\@UEBA_NAEBVCraftingContainer\@\@AEBVCraftingContext\@\@\@Z */ - virtual bool matches(class CraftingContainer &, class Level &) const; + virtual bool matches(class CraftingContainer const &, class CraftingContext const &) const; /** * @vftbl 7 * @symbol ?size\@BannerDuplicateRecipe\@\@UEBAHXZ diff --git a/LiteLoader/include/llapi/mc/BannerItem.hpp b/LiteLoader/include/llapi/mc/BannerItem.hpp index 2aeb1bfa0f..c166a6fd2b 100644 --- a/LiteLoader/include/llapi/mc/BannerItem.hpp +++ b/LiteLoader/include/llapi/mc/BannerItem.hpp @@ -36,11 +36,6 @@ class BannerItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class BannerItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -122,7 +122,17 @@ class BannerItem : public Item { */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 132 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 134 * @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 580a6d21dd..adb0dbafba 100644 --- a/LiteLoader/include/llapi/mc/BannerPatternItem.hpp +++ b/LiteLoader/include/llapi/mc/BannerPatternItem.hpp @@ -36,11 +36,6 @@ class BannerPatternItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class BannerPatternItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -116,6 +116,16 @@ class BannerPatternItem : public Item { * @symbol ?buildDescriptionId\@BannerPatternItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BANNERPATTERNITEM /** * @symbol ?isPattern\@BannerPatternItem\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/BarrelBlock.hpp b/LiteLoader/include/llapi/mc/BarrelBlock.hpp index 5526920dcc..52f3f08453 100644 --- a/LiteLoader/include/llapi/mc/BarrelBlock.hpp +++ b/LiteLoader/include/llapi/mc/BarrelBlock.hpp @@ -40,16 +40,21 @@ class BarrelBlock : public FaceDirectionalBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class BarrelBlock : public FaceDirectionalBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class BarrelBlock : public FaceDirectionalBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,135 +131,130 @@ class BarrelBlock : public FaceDirectionalBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 51 + * @vftbl 50 * @symbol ?isSignalSource\@BarrelBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_53(); + /** + * @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 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 127 + * @vftbl 125 * @symbol ?getComparatorSignal\@BarrelBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@BarrelBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 151 + * @vftbl 149 * @symbol ?getFaceFlip\@BarrelBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z */ virtual enum class Flip getFaceFlip(unsigned char, class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@BarrelBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@BarrelBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #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 b434ce51e2..194e0e1398 100644 --- a/LiteLoader/include/llapi/mc/BarrierBlock.hpp +++ b/LiteLoader/include/llapi/mc/BarrierBlock.hpp @@ -45,16 +45,21 @@ class BarrierBlock : public BlockLegacy { * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class BarrierBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class BarrierBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,15 +136,15 @@ class BarrierBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -147,99 +152,94 @@ class BarrierBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@BarrierBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 142 + * @vftbl 140 * @symbol ?getShadeBrightness\@BarrierBlock\@\@UEBAMAEBVBlock\@\@\@Z */ virtual float getShadeBrightness(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 20be8b58f0..53389f88c3 100644 --- a/LiteLoader/include/llapi/mc/BaseAttributeMap.hpp +++ b/LiteLoader/include/llapi/mc/BaseAttributeMap.hpp @@ -64,6 +64,10 @@ 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 */ @@ -72,10 +76,6 @@ class BaseAttributeMap { * @symbol ?getMutableInstance\@BaseAttributeMap\@\@QEAAPEAVAttributeInstance\@\@AEBVHashedString\@\@\@Z */ MCAPI class AttributeInstance * getMutableInstance(class HashedString const &); - /** - * @symbol ?getMutableInstance\@BaseAttributeMap\@\@QEAAPEAVAttributeInstance\@\@I\@Z - */ - MCAPI class AttributeInstance * getMutableInstance(unsigned int); /** * @symbol ?getSyncableAttributes\@BaseAttributeMap\@\@QEBA?AV?$vector\@VAttributeInstanceHandle\@\@V?$allocator\@VAttributeInstanceHandle\@\@\@std\@\@\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BaseBlockLocationIterator.hpp b/LiteLoader/include/llapi/mc/BaseBlockLocationIterator.hpp new file mode 100644 index 0000000000..0c6d82220c --- /dev/null +++ b/LiteLoader/include/llapi/mc/BaseBlockLocationIterator.hpp @@ -0,0 +1,79 @@ +/** + * @file BaseBlockLocationIterator.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class BaseBlockLocationIterator { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BASEBLOCKLOCATIONITERATOR +public: + BaseBlockLocationIterator(class BaseBlockLocationIterator const &) = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ??EBaseBlockLocationIterator\@\@UEAAAEAV0\@XZ + */ + virtual class BaseBlockLocationIterator & operator++(); + /** + * @vftbl 2 + * @symbol ??EBaseBlockLocationIterator\@\@UEAA?AV0\@H\@Z + */ + virtual class BaseBlockLocationIterator operator++(int); + /** + * @vftbl 3 + * @symbol ?_begin\@BaseBlockLocationIterator\@\@MEAAXXZ + */ + virtual void _begin(); + /** + * @vftbl 4 + * @symbol ?_end\@BaseBlockLocationIterator\@\@MEAAXXZ + */ + virtual void _end(); + /** + * @symbol ?done\@BaseBlockLocationIterator\@\@QEBA_NXZ + */ + MCAPI bool done() const; + /** + * @symbol ??DBaseBlockLocationIterator\@\@QEBA?AVBlockPos\@\@XZ + */ + MCAPI class BlockPos operator*() const; + /** + * @symbol ?reset\@BaseBlockLocationIterator\@\@QEAAXXZ + */ + MCAPI void reset(); + +//protected: + /** + * @symbol ??0BaseBlockLocationIterator\@\@IEAA\@AEBVBlockPos\@\@0_N\@Z + */ + MCAPI BaseBlockLocationIterator(class BlockPos const &, class BlockPos const &, bool); + /** + * @symbol ??0BaseBlockLocationIterator\@\@IEAA\@XZ + */ + MCAPI BaseBlockLocationIterator(); + /** + * @symbol ??4BaseBlockLocationIterator\@\@IEAAAEAV0\@AEBV0\@\@Z + */ + MCAPI class BaseBlockLocationIterator & operator=(class BaseBlockLocationIterator const &); + +protected: + +}; diff --git a/LiteLoader/include/llapi/mc/BaseGameVersion.hpp b/LiteLoader/include/llapi/mc/BaseGameVersion.hpp index 40c0626079..e58a39bd96 100644 --- a/LiteLoader/include/llapi/mc/BaseGameVersion.hpp +++ b/LiteLoader/include/llapi/mc/BaseGameVersion.hpp @@ -27,10 +27,6 @@ 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 */ @@ -39,6 +35,10 @@ 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 d948eda5c8..11b9637b38 100644 --- a/LiteLoader/include/llapi/mc/BaseMoveToGoal.hpp +++ b/LiteLoader/include/llapi/mc/BaseMoveToGoal.hpp @@ -86,7 +86,7 @@ class BaseMoveToGoal { virtual bool hasReachedTarget() const; /** * @vftbl 11 - * @symbol ?isValidTarget\@LayEggGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isValidTarget\@OcelotSitOnBlockGoal\@\@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 70d72ad525..0ff379a11a 100644 --- a/LiteLoader/include/llapi/mc/BasePressurePlateBlock.hpp +++ b/LiteLoader/include/llapi/mc/BasePressurePlateBlock.hpp @@ -45,16 +45,21 @@ class BasePressurePlateBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class BasePressurePlateBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class BasePressurePlateBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,207 +136,202 @@ class BasePressurePlateBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 51 + * @vftbl 50 * @symbol ?isSignalSource\@BasePressurePlateBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_53(); + /** + * @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 64 + * @vftbl 63 * @symbol ?shouldConnectToRedstone\@BasePressurePlateBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 69 + * @vftbl 68 * @symbol ?checkIsPathable\@BasePressurePlateBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@BasePressurePlateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@BasePressurePlateBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@BasePressurePlateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 108 + * @vftbl 107 * @symbol ?isAttachedTo\@BasePressurePlateBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool isAttachedTo(class BlockSource &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 112 + * @vftbl 111 * @symbol ?shouldTriggerEntityInside\@BasePressurePlateBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual bool shouldTriggerEntityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 113 + * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@BasePressurePlateBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@BasePressurePlateBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 148 + * @vftbl 146 * @symbol ?canSpawnOn\@BasePressurePlateBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@BasePressurePlateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@BasePressurePlateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@BasePressurePlateBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@BasePressurePlateBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 195 + * @vftbl 194 * @symbol ?getTickDelay\@BasePressurePlateBlock\@\@UEBAHXZ */ virtual int getTickDelay() const; /** - * @vftbl 196 + * @vftbl 195 * @symbol ?getSignalStrength\@PressurePlateBlock\@\@MEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getSignalStrength(class BlockSource &, class BlockPos const &) const = 0; /** - * @vftbl 197 + * @vftbl 196 * @symbol ?getSignalForData\@PressurePlateBlock\@\@MEBAHH\@Z */ virtual int getSignalForData(int) const = 0; /** - * @vftbl 198 + * @vftbl 197 * @symbol ?getRedstoneSignal\@PressurePlateBlock\@\@MEBAHH\@Z */ virtual int getRedstoneSignal(int) const = 0; /** - * @vftbl 199 + * @vftbl 198 * @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 95bafaaf03..ced9caf232 100644 --- a/LiteLoader/include/llapi/mc/BaseRailBlock.hpp +++ b/LiteLoader/include/llapi/mc/BaseRailBlock.hpp @@ -45,16 +45,21 @@ class BaseRailBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -67,14 +72,14 @@ class BaseRailBlock : public BlockLegacy { virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol __unk_vfn_34 + * @symbol ?isWaterBlocking\@BaseRailBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_34(); + virtual bool isWaterBlocking() const; /** * @vftbl 35 - * @symbol ?isWaterBlocking\@BaseRailBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_35 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +111,10 @@ class BaseRailBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,15 +141,15 @@ class BaseRailBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -152,149 +157,144 @@ class BaseRailBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@BaseRailBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 73 + * @vftbl 72 * @symbol ?onRedstoneUpdate\@BaseRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@BaseRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@BaseRailBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@BaseRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 141 + * @vftbl 139 * @symbol ?onGraphicsModeChanged\@BaseRailBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@BaseRailBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 148 + * @vftbl 146 * @symbol ?canSpawnOn\@BaseRailBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@BaseRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@BaseRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@BaseRailBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 182 + * @vftbl 180 * @symbol ?getRenderLayer\@BaseRailBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #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 index af5e4fd0b9..671eff3d05 100644 --- a/LiteLoader/include/llapi/mc/BasicLoader.hpp +++ b/LiteLoader/include/llapi/mc/BasicLoader.hpp @@ -29,6 +29,12 @@ class BasicLoader { #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 */ diff --git a/LiteLoader/include/llapi/mc/Bat.hpp b/LiteLoader/include/llapi/mc/Bat.hpp index 8df1467760..36b8b6f97a 100644 --- a/LiteLoader/include/llapi/mc/Bat.hpp +++ b/LiteLoader/include/llapi/mc/Bat.hpp @@ -37,155 +37,150 @@ class Bat : public Mob { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 - */ - virtual void __unk_vfn_178(); - /** - * @vftbl 181 + * @vftbl 179 * @symbol ?checkFallDamage\@Bat\@\@MEAAXM_N\@Z */ virtual void checkFallDamage(float, bool); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@Bat\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@Bat\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@Bat\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 290 + * @vftbl 282 * @symbol ?pushActors\@Bat\@\@UEAAXXZ */ virtual void pushActors(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 346 + * @vftbl 338 * @symbol ?newServerAiStep\@Bat\@\@MEAAXXZ */ virtual void newServerAiStep(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0Bat\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BeaconBlock.hpp b/LiteLoader/include/llapi/mc/BeaconBlock.hpp index 642cf820c4..8b6d6ffabd 100644 --- a/LiteLoader/include/llapi/mc/BeaconBlock.hpp +++ b/LiteLoader/include/llapi/mc/BeaconBlock.hpp @@ -40,16 +40,21 @@ class BeaconBlock : public ActorBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class BeaconBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class BeaconBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,15 +131,15 @@ class BeaconBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -142,99 +147,94 @@ class BeaconBlock : public ActorBlock { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@BeaconBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 + */ + virtual void __unk_vfn_74(); + /** + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@BeaconBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #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 d89fddf092..aa0f85f69d 100644 --- a/LiteLoader/include/llapi/mc/BedBlock.hpp +++ b/LiteLoader/include/llapi/mc/BedBlock.hpp @@ -45,16 +45,21 @@ class BedBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class BedBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class BedBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,195 +136,190 @@ class BedBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_53(); /** - * @vftbl 56 + * @vftbl 55 * @symbol ?canFillAtPos\@BedBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canFillAtPos(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 57 + * @vftbl 56 * @symbol ?sanitizeFillBlock\@BedBlock\@\@UEBAAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBV2\@\@Z */ virtual class Block const & sanitizeFillBlock(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 58 + * @vftbl 57 * @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 + */ + 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 69 + * @vftbl 68 * @symbol ?checkIsPathable\@BedBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 81 + * @vftbl 80 * @symbol ?updateEntityAfterFallOn\@BedBlock\@\@UEBAXAEBVBlockPos\@\@AEAUUpdateEntityAfterFallOnInterface\@\@\@Z */ virtual void updateEntityAfterFallOn(class BlockPos const &, struct UpdateEntityAfterFallOnInterface &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@BedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 100 + * @vftbl 99 * @symbol ?getSecondPart\@BedBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool getSecondPart(class BlockSource const &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 101 + * @vftbl 100 * @symbol ?playerWillDestroy\@BedBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 102 + * @vftbl 101 * @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 103 + * @vftbl 102 * @symbol ?asItemInstance\@BedBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 - */ - virtual void __unk_vfn_129(); - /** - * @vftbl 130 + * @vftbl 128 * @symbol ?canSpawnAt\@BedBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSpawnAt(class BlockSource const &, class BlockPos const &) const; /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 146 + * @vftbl 144 * @symbol ?telemetryVariant\@BedBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int telemetryVariant(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@BedBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?getMappedFace\@BedBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@BedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 + * @vftbl 168 * @symbol ?onFallOn\@BedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@BedBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 186 + * @vftbl 185 * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #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 b22ae3fb9e..94c6143646 100644 --- a/LiteLoader/include/llapi/mc/BedBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BedBlockActor.hpp @@ -111,17 +111,17 @@ class BedBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); /** - * @vftbl 37 + * @vftbl 39 * @symbol ?_getUpdatePacket\@BedBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 38 + * @vftbl 40 * @symbol ?_onUpdatePacket\@BedBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/BedItem.hpp b/LiteLoader/include/llapi/mc/BedItem.hpp index b4820811ee..4318f67741 100644 --- a/LiteLoader/include/llapi/mc/BedItem.hpp +++ b/LiteLoader/include/llapi/mc/BedItem.hpp @@ -36,11 +36,6 @@ class BedItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class BedItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -112,17 +112,27 @@ class BedItem : public Item { */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 118 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 120 * @symbol ?getIconInfo\@BedItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 130 + * @vftbl 132 * @symbol ?_checkUseOnPermissions\@BedItem\@\@EEBA_NAEAVActor\@\@AEAVItemStackBase\@\@AEBEAEBVBlockPos\@\@\@Z */ virtual bool _checkUseOnPermissions(class Actor &, class ItemStackBase &, unsigned char const &, class BlockPos const &) const; /** - * @vftbl 132 + * @vftbl 134 * @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 3eff654a1f..3c4a769a8f 100644 --- a/LiteLoader/include/llapi/mc/Bedrock.hpp +++ b/LiteLoader/include/llapi/mc/Bedrock.hpp @@ -204,6 +204,8 @@ template <> MCAPI typeid_t type_id(); template<> MCAPI typeid_t type_id(); +template <> +MCAPI typeid_t type_id(); //template <> //inline typeid_t type_id() { @@ -220,10 +222,6 @@ MCAPI typeid_t type_id _getUpdatePacket(class BlockSource &); /** - * @vftbl 38 + * @vftbl 40 * @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 e16e9037aa..681e1877bb 100644 --- a/LiteLoader/include/llapi/mc/BellBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/BellBlockItem.hpp @@ -37,11 +37,6 @@ class BellBlockItem : public BlockItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -57,6 +52,11 @@ class BellBlockItem : public BlockItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -103,20 +103,20 @@ class BellBlockItem : public BlockItem { */ virtual void __unk_vfn_80(); /** - * @vftbl 132 - * @symbol ?_useOn\@BellBlockItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 115 + * @symbol __unk_vfn_115 */ - virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual void __unk_vfn_115(); /** - * @vftbl 133 - * @symbol __unk_vfn_133 + * @vftbl 116 + * @symbol __unk_vfn_116 */ - virtual void __unk_vfn_133(); + virtual void __unk_vfn_116(); /** * @vftbl 134 - * @symbol __unk_vfn_134 + * @symbol ?_useOn\@BellBlockItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual void __unk_vfn_134(); + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @vftbl 135 * @symbol __unk_vfn_135 @@ -599,9 +599,9 @@ class BellBlockItem : public BlockItem { virtual void __unk_vfn_230(); /** * @vftbl 231 - * @symbol ?getPotionType\@SplashPotionItem\@\@UEBA?AW4PotionType\@Potion\@\@XZ + * @symbol __unk_vfn_231 */ - virtual enum class Potion::PotionType getPotionType() const; + virtual void __unk_vfn_231(); /** * @vftbl 232 * @symbol __unk_vfn_232 @@ -609,9 +609,9 @@ class BellBlockItem : public BlockItem { virtual void __unk_vfn_232(); /** * @vftbl 233 - * @symbol __unk_vfn_233 + * @symbol ?getPotionType\@SplashPotionItem\@\@UEBA?AW4PotionType\@Potion\@\@XZ */ - virtual void __unk_vfn_233(); + virtual enum class Potion::PotionType getPotionType() const; /** * @vftbl 234 * @symbol __unk_vfn_234 @@ -629,6 +629,16 @@ class BellBlockItem : public BlockItem { 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; diff --git a/LiteLoader/include/llapi/mc/BigDripleafBlock.hpp b/LiteLoader/include/llapi/mc/BigDripleafBlock.hpp index c6a25d6a24..d6f02e8acd 100644 --- a/LiteLoader/include/llapi/mc/BigDripleafBlock.hpp +++ b/LiteLoader/include/llapi/mc/BigDripleafBlock.hpp @@ -55,16 +55,21 @@ class BigDripleafBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -77,14 +82,14 @@ class BigDripleafBlock : public BlockLegacy { virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol __unk_vfn_34 + * @symbol ?isWaterBlocking\@BigDripleafBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_34(); + virtual bool isWaterBlocking() const; /** * @vftbl 35 - * @symbol ?isWaterBlocking\@BigDripleafBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_35 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -116,10 +121,10 @@ class BigDripleafBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -146,15 +151,15 @@ class BigDripleafBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -162,164 +167,159 @@ class BigDripleafBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@BigDripleafBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 69 + * @vftbl 68 * @symbol ?checkIsPathable\@BigDripleafBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 73 + * @vftbl 72 * @symbol ?onRedstoneUpdate\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@BigDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@BigDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 93 + * @vftbl 92 * @symbol ?mayPlaceOn\@BigDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 113 + * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@BigDripleafBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 153 + * @vftbl 151 * @symbol ?init\@BigDripleafBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@BigDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #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 9c9175911a..5e69e8d095 100644 --- a/LiteLoader/include/llapi/mc/BinaryStream.hpp +++ b/LiteLoader/include/llapi/mc/BinaryStream.hpp @@ -78,14 +78,14 @@ class BinaryStream : public ReadOnlyBinaryStream { */ MCVAPI ~BinaryStream(); #endif - /** - * @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 ??0BinaryStream\@\@QEAA\@XZ + */ + MCAPI BinaryStream(); /** * @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/BiomeDefinitionListPacket.hpp b/LiteLoader/include/llapi/mc/BiomeDefinitionListPacket.hpp index dec817d485..91a1f97320 100644 --- a/LiteLoader/include/llapi/mc/BiomeDefinitionListPacket.hpp +++ b/LiteLoader/include/llapi/mc/BiomeDefinitionListPacket.hpp @@ -51,14 +51,14 @@ class BiomeDefinitionListPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 4 - * @symbol ?readExtended\@BiomeDefinitionListPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@BiomeDefinitionListPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult read(class ReadOnlyBinaryStream &); /** * @vftbl 7 - * @symbol ?_read\@BiomeDefinitionListPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@BiomeDefinitionListPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BIOMEDEFINITIONLISTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/BiomeSourceUtil.hpp b/LiteLoader/include/llapi/mc/BiomeSourceUtil.hpp index e108ba1a6d..baab213d42 100644 --- a/LiteLoader/include/llapi/mc/BiomeSourceUtil.hpp +++ b/LiteLoader/include/llapi/mc/BiomeSourceUtil.hpp @@ -29,13 +29,13 @@ namespace BiomeSourceUtil { * @symbol ?locateBiome\@BiomeSourceUtil\@\@YA?AV?$optional\@VBlockPos\@\@\@std\@\@AEBV?$function\@$$A6A_NAEBVBiome\@\@\@Z\@3\@AEBVBiomeSource\@\@AEBVBoundingBox\@\@I\@Z */ MCAPI class std::optional locateBiome(class std::function const &, class BiomeSource const &, class BoundingBox 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); /** * @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 6b1800dfed..f1a1dadc4a 100644 --- a/LiteLoader/include/llapi/mc/BlastFurnaceBlock.hpp +++ b/LiteLoader/include/llapi/mc/BlastFurnaceBlock.hpp @@ -40,16 +40,21 @@ class BlastFurnaceBlock : public FurnaceBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class BlastFurnaceBlock : public FurnaceBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class BlastFurnaceBlock : public FurnaceBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,122 +131,117 @@ class BlastFurnaceBlock : public FurnaceBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@BlastFurnaceBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@BlastFurnaceBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@BlastFurnaceBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @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 69edaefc88..c3adf6c4c5 100644 --- a/LiteLoader/include/llapi/mc/Blaze.hpp +++ b/LiteLoader/include/llapi/mc/Blaze.hpp @@ -42,152 +42,147 @@ class Blaze : public Monster { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@Blaze\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** * @vftbl 85 - * @symbol __unk_vfn_85 - */ - virtual void __unk_vfn_85(); - /** - * @vftbl 87 * @symbol ?getBrightness\@Blaze\@\@UEBAMMAEBVIConstBlockSource\@\@\@Z */ virtual float getBrightness(float, class IConstBlockSource const &) const; /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_86(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_94(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_97(); /** - * @vftbl 104 + * @vftbl 102 * @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 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); - /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 286 + * @vftbl 278 * @symbol ?travel\@Blaze\@\@UEAAXMMM_N\@Z */ virtual void travel(float, float, float, bool); /** - * @vftbl 288 + * @vftbl 280 * @symbol ?aiStep\@Blaze\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** - * @vftbl 353 + * @vftbl 345 * @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 e149142205..772c33eb14 100644 --- a/LiteLoader/include/llapi/mc/BlazePreTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/BlazePreTravelSystem.hpp @@ -34,6 +34,10 @@ 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 65e18ad7b8..7072929a09 100644 --- a/LiteLoader/include/llapi/mc/Block.hpp +++ b/LiteLoader/include/llapi/mc/Block.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "BlockLegacy.hpp" #define BEFORE_EXTRA // Add include headers & pre-declares @@ -104,14 +105,14 @@ class Block { * @symbol ?animateTick\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ MCAPI void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; - /** - * @symbol ?asItemInstance\@Block\@\@QEBA?AVItemInstance\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI class ItemInstance asItemInstance(class BlockSource &, class BlockPos const &) const; /** * @symbol ?asItemInstance\@Block\@\@QEBA?AVItemInstance\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z */ MCAPI class ItemInstance asItemInstance(class BlockSource &, class BlockPos const &, bool) const; + /** + * @symbol ?asItemInstance\@Block\@\@QEBA?AVItemInstance\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI class ItemInstance asItemInstance(class BlockSource &, class BlockPos const &) const; /** * @symbol ?attack\@Block\@\@QEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ @@ -136,22 +137,18 @@ class Block { * @symbol ?cacheComponentData\@Block\@\@QEAAXXZ */ MCAPI void cacheComponentData(); - /** - * @symbol ?calcGroundFriction\@Block\@\@QEBAMAEBUIMobMovementProxy\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI float calcGroundFriction(struct IMobMovementProxy const &, class BlockPos const &) const; /** * @symbol ?canBeBrokenFromFalling\@Block\@\@QEBA_NXZ */ MCAPI bool canBeBrokenFromFalling() 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 ?canBeBuiltOver\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlockItem\@\@\@Z + */ + MCAPI bool canBeBuiltOver(class BlockSource &, class BlockPos const &, class BlockItem const &) const; /** * @symbol ?canBeFertilized\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBV1\@\@Z */ @@ -216,14 +213,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_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 ?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 ?computeRawSerializationIdHashForNetwork\@Block\@\@QEBAIXZ */ @@ -276,22 +273,22 @@ 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\@\@QEBAHXZ - */ - MCAPI int getColor() 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 ?getComparatorSignal\@Block\@\@QEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ MCAPI int getComparatorSignal(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @symbol ?getConnectedDirections\@Block\@\@QEBAXAEBVBlockPos\@\@AEAVBlockSource\@\@AEA_N222\@Z + * @symbol ?getConnectedDirections\@Block\@\@QEBA?AUHorizontalDirectionBits\@BlockLegacy\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@\@Z */ - MCAPI void getConnectedDirections(class BlockPos const &, class BlockSource &, bool &, bool &, bool &, bool &) const; + MCAPI struct BlockLegacy::HorizontalDirectionBits getConnectedDirections(class BlockPos const &, class BlockSource &) const; /** * @symbol ?getCreativeCategory\@Block\@\@QEBA?AW4CreativeItemCategory\@\@XZ */ @@ -472,6 +469,10 @@ class Block { * @symbol ?isEmpty\@Block\@\@QEBA_NXZ */ MCAPI bool isEmpty() const; + /** + * @symbol ?isFallingBlock\@Block\@\@QEBA_NXZ + */ + MCAPI bool isFallingBlock() const; /** * @symbol ?isFenceBlock\@Block\@\@QEBA_NXZ */ @@ -484,10 +485,6 @@ class Block { * @symbol ?isFilteredOut\@Block\@\@QEBA_NW4BlockRenderLayer\@\@\@Z */ MCAPI bool isFilteredOut(enum class BlockRenderLayer) const; - /** - * @symbol ?isHeavy\@Block\@\@QEBA_NXZ - */ - MCAPI bool isHeavy() const; /** * @symbol ?isInteractiveBlock\@Block\@\@QEBA_NXZ */ @@ -580,22 +577,22 @@ class Block { * @symbol ?mayConsumeFertilizer\@Block\@\@QEBA_NAEAVBlockSource\@\@\@Z */ MCAPI bool mayConsumeFertilizer(class BlockSource &) const; - /** - * @symbol ?mayPick\@Block\@\@QEBA_NXZ - */ - MCAPI bool mayPick() const; /** * @symbol ?mayPick\@Block\@\@QEBA_NAEBVBlockSource\@\@_N\@Z */ MCAPI bool mayPick(class BlockSource const &, bool) const; /** - * @symbol ?mayPlace\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?mayPick\@Block\@\@QEBA_NXZ */ - MCAPI bool mayPlace(class BlockSource &, class BlockPos const &) const; + MCAPI bool mayPick() const; /** * @symbol ?mayPlace\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ MCAPI bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; + /** + * @symbol ?mayPlace\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI bool mayPlace(class BlockSource &, class BlockPos const &) const; /** * @symbol ?mayPlaceOn\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockActor.hpp b/LiteLoader/include/llapi/mc/BlockActor.hpp index cb75815dd9..4e67f4e93e 100644 --- a/LiteLoader/include/llapi/mc/BlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BlockActor.hpp @@ -224,21 +224,31 @@ class BlockActor { virtual void __unk_vfn_35(); /** * @vftbl 36 - * @symbol __unk_vfn_36 + * @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 void __unk_vfn_36(); + virtual std::vector getUgcStrings(class CompoundTag const &) const; /** * @vftbl 37 + * @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 + */ + virtual void __unk_vfn_38(); + /** + * @vftbl 39 * @symbol ?_getUpdatePacket\@BlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 38 + * @vftbl 40 * @symbol ?_onUpdatePacket\@BlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @vftbl 39 + * @vftbl 41 * @symbol ?_playerCanUpdate\@BlockActor\@\@MEBA_NAEBVPlayer\@\@\@Z */ virtual bool _playerCanUpdate(class Player const &) const; diff --git a/LiteLoader/include/llapi/mc/BlockActorDataPacket.hpp b/LiteLoader/include/llapi/mc/BlockActorDataPacket.hpp index 72c181e166..8402059372 100644 --- a/LiteLoader/include/llapi/mc/BlockActorDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/BlockActorDataPacket.hpp @@ -52,9 +52,9 @@ class BlockActorDataPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@BlockActorDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@BlockActorDataPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0BlockActorDataPacket\@\@QEAA\@AEBVBlockPos\@\@VCompoundTag\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockBreathabilityDescription.hpp b/LiteLoader/include/llapi/mc/BlockBreathabilityDescription.hpp index 8a4e66a397..1091cb951e 100644 --- a/LiteLoader/include/llapi/mc/BlockBreathabilityDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockBreathabilityDescription.hpp @@ -48,16 +48,21 @@ struct BlockBreathabilityDescription { virtual void __unk_vfn_3(); /** * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); + /** + * @vftbl 5 * @symbol ?isNetworkComponent\@BlockBreathabilityDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 + * @vftbl 6 * @symbol ?buildNetworkTag\@BlockBreathabilityDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?initializeFromNetwork\@BlockBreathabilityDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/BlockCollisionBoxDescription.hpp b/LiteLoader/include/llapi/mc/BlockCollisionBoxDescription.hpp index 12c8866720..22907376a2 100644 --- a/LiteLoader/include/llapi/mc/BlockCollisionBoxDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockCollisionBoxDescription.hpp @@ -41,24 +41,43 @@ struct BlockCollisionBoxDescription { virtual void initializeComponent(class EntityContext &) const; /** * @vftbl 3 - * @symbol __unk_vfn_3 + * @symbol ?initializeComponentFromCode\@BlockCollisionBoxDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ - virtual void __unk_vfn_3(); + virtual void initializeComponentFromCode(class EntityContext &) const; /** * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); + /** + * @vftbl 5 * @symbol ?isNetworkComponent\@BlockCollisionBoxDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 + * @vftbl 6 * @symbol ?buildNetworkTag\@BlockCollisionBoxDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?initializeFromNetwork\@BlockCollisionBoxDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKCOLLISIONBOXDESCRIPTION + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BlockCollisionBoxDescription(); +#endif + /** + * @symbol ??0BlockCollisionBoxDescription\@\@QEAA\@AEBVVec3\@\@0\@Z + */ + MCAPI BlockCollisionBoxDescription(class Vec3 const &, class Vec3 const &); + /** + * @symbol ??0BlockCollisionBoxDescription\@\@QEAA\@_N\@Z + */ + MCAPI BlockCollisionBoxDescription(bool); /** * @symbol ?NameID\@BlockCollisionBoxDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ diff --git a/LiteLoader/include/llapi/mc/BlockCollisionsSystem.hpp b/LiteLoader/include/llapi/mc/BlockCollisionsSystem.hpp new file mode 100644 index 0000000000..57a7a78957 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockCollisionsSystem.hpp @@ -0,0 +1,32 @@ +/** + * @file BlockCollisionsSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class BlockCollisionsSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKCOLLISIONSSYSTEM +public: + class BlockCollisionsSystem& operator=(class BlockCollisionsSystem const &) = delete; + BlockCollisionsSystem(class BlockCollisionsSystem const &) = delete; + BlockCollisionsSystem() = delete; +#endif + +public: + /** + * @symbol ?createBlockCollisionsSystem\@BlockCollisionsSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createBlockCollisionsSystem(); + +}; diff --git a/LiteLoader/include/llapi/mc/BlockComponentDescription.hpp b/LiteLoader/include/llapi/mc/BlockComponentDescription.hpp index d8e8d09fc9..ff7325c9bc 100644 --- a/LiteLoader/include/llapi/mc/BlockComponentDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockComponentDescription.hpp @@ -51,11 +51,16 @@ struct BlockComponentDescription { virtual void __unk_vfn_3(); /** * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); + /** + * @vftbl 5 * @symbol ?isNetworkComponent\@BlockComponentDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 + * @vftbl 6 * @symbol ?buildNetworkTag\@BlockComponentDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; @@ -72,6 +77,10 @@ struct BlockComponentDescription { * @symbol ?initializeComponent\@BlockComponentDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ MCVAPI void initializeComponent(class EntityContext &) const; + /** + * @symbol ?initializeComponentFromCode\@BlockComponentDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + */ + MCVAPI void initializeComponentFromCode(class EntityContext &) const; /** * @symbol ?initializeFromNetwork\@BlockComponentDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockComponentStorage.hpp b/LiteLoader/include/llapi/mc/BlockComponentStorage.hpp new file mode 100644 index 0000000000..81877fa7c3 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockComponentStorage.hpp @@ -0,0 +1,32 @@ +/** + * @file BlockComponentStorage.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class BlockComponentStorage { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKCOMPONENTSTORAGE +public: + class BlockComponentStorage& operator=(class BlockComponentStorage const &) = delete; + BlockComponentStorage(class BlockComponentStorage const &) = delete; + BlockComponentStorage() = delete; +#endif + +public: + /** + * @symbol ??1BlockComponentStorage\@\@QEAA\@XZ + */ + MCAPI ~BlockComponentStorage(); + +}; diff --git a/LiteLoader/include/llapi/mc/BlockCraftingTableDescription.hpp b/LiteLoader/include/llapi/mc/BlockCraftingTableDescription.hpp index b7f1d43de8..67ac3121fd 100644 --- a/LiteLoader/include/llapi/mc/BlockCraftingTableDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockCraftingTableDescription.hpp @@ -46,16 +46,21 @@ struct BlockCraftingTableDescription { virtual void __unk_vfn_3(); /** * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); + /** + * @vftbl 5 * @symbol ?isNetworkComponent\@BlockCraftingTableDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 + * @vftbl 6 * @symbol ?buildNetworkTag\@BlockCraftingTableDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 7 * @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 6c48160f61..e9db63ce32 100644 --- a/LiteLoader/include/llapi/mc/BlockDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BlockDefinition.hpp @@ -22,13 +22,10 @@ struct BlockDefinition { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKDEFINITION public: struct BlockDefinition& operator=(struct BlockDefinition const &) = delete; + BlockDefinition() = delete; #endif public: - /** - * @symbol ??0BlockDefinition\@\@QEAA\@XZ - */ - MCAPI BlockDefinition(); /** * @symbol ??0BlockDefinition\@\@QEAA\@$$QEAU0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockDefinitionGroup.hpp b/LiteLoader/include/llapi/mc/BlockDefinitionGroup.hpp index 8cc3f0ebce..b199e7c3f7 100644 --- a/LiteLoader/include/llapi/mc/BlockDefinitionGroup.hpp +++ b/LiteLoader/include/llapi/mc/BlockDefinitionGroup.hpp @@ -111,9 +111,9 @@ struct BlockResource { */ MCAPI void _initializeComponentPostProcessors(); /** - * @symbol ?_loadBlockDescription\@BlockDefinitionGroup\@\@AEAA_NAEBVValue\@Json\@\@AEAUBlockDescription\@\@\@Z + * @symbol ?_loadBlockDescription\@BlockDefinitionGroup\@\@AEAA_NAEBVValue\@Json\@\@AEAUBlockDescription\@\@AEBVSemVersion\@\@AEBVExperiments\@\@\@Z */ - MCAPI bool _loadBlockDescription(class Json::Value const &, struct BlockDescription &); + MCAPI bool _loadBlockDescription(class Json::Value const &, struct BlockDescription &, class SemVersion const &, class Experiments const &); /** * @symbol ?_loadComponents\@BlockDefinitionGroup\@\@AEAA_NAEBVValue\@Json\@\@AEAUBlockDefinition\@\@AEBVExperiments\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockDescription.hpp b/LiteLoader/include/llapi/mc/BlockDescription.hpp index 5e06b6e54d..e7a7b50495 100644 --- a/LiteLoader/include/llapi/mc/BlockDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockDescription.hpp @@ -19,12 +19,15 @@ struct BlockDescription { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKDESCRIPTION -public: - BlockDescription() = delete; -#endif - public: + /** + * @symbol ??0BlockDescription\@\@QEAA\@$$QEAU0\@\@Z + */ + MCAPI BlockDescription(struct BlockDescription &&); + /** + * @symbol ??0BlockDescription\@\@QEAA\@XZ + */ + MCAPI BlockDescription(); /** * @symbol ??0BlockDescription\@\@QEAA\@AEBU0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockDescriptor.hpp b/LiteLoader/include/llapi/mc/BlockDescriptor.hpp index 086610db95..b6621e31dd 100644 --- a/LiteLoader/include/llapi/mc/BlockDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/BlockDescriptor.hpp @@ -31,10 +31,6 @@ 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 */ @@ -47,6 +43,10 @@ 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\@\@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 ?anyMatch\@BlockDescriptor\@\@SA_NAEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@AEBV1\@\@Z + */ + MCAPI static bool anyMatch(std::vector const &, class BlockDescriptor const &); /** * @symbol ?bindType\@BlockDescriptor\@\@SAXXZ */ @@ -142,9 +142,9 @@ class BlockDescriptor { //private: /** - * @symbol ?_resolveImpl\@BlockDescriptor\@\@AEAAX_N\@Z + * @symbol ?_resolve\@BlockDescriptor\@\@AEBAX_N\@Z */ - MCAPI void _resolveImpl(bool); + MCAPI void _resolve(bool) const; private: diff --git a/LiteLoader/include/llapi/mc/BlockDestructibleByMiningDescription.hpp b/LiteLoader/include/llapi/mc/BlockDestructibleByMiningDescription.hpp index 03ee3f5511..7b88e03b7c 100644 --- a/LiteLoader/include/llapi/mc/BlockDestructibleByMiningDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockDestructibleByMiningDescription.hpp @@ -46,16 +46,21 @@ struct BlockDestructibleByMiningDescription { virtual void __unk_vfn_3(); /** * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); + /** + * @vftbl 5 * @symbol ?isNetworkComponent\@BlockDestructibleByMiningDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 + * @vftbl 6 * @symbol ?buildNetworkTag\@BlockDestructibleByMiningDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?initializeFromNetwork\@BlockDestructibleByMiningDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/BlockDisplayNameDescription.hpp b/LiteLoader/include/llapi/mc/BlockDisplayNameDescription.hpp index 7688833d97..2d12ae95b9 100644 --- a/LiteLoader/include/llapi/mc/BlockDisplayNameDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockDisplayNameDescription.hpp @@ -48,16 +48,21 @@ struct BlockDisplayNameDescription { virtual void __unk_vfn_3(); /** * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); + /** + * @vftbl 5 * @symbol ?isNetworkComponent\@BlockDisplayNameDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 + * @vftbl 6 * @symbol ?buildNetworkTag\@BlockDisplayNameDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 7 * @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 85795cce84..54611fe998 100644 --- a/LiteLoader/include/llapi/mc/BlockEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/BlockEventCoordinator.hpp @@ -50,9 +50,9 @@ class BlockEventCoordinator { */ MCAPI void sendBlockDestructionStopped(class Player &, class BlockPos const &, int); /** - * @symbol ?sendBlockExploded\@BlockEventCoordinator\@\@QEAAXAEBVBlockPos\@\@AEBVBlock\@\@PEAVActor\@\@\@Z + * @symbol ?sendBlockExploded\@BlockEventCoordinator\@\@QEAAXAEAVDimension\@\@AEBVBlockPos\@\@AEBVBlock\@\@PEAVActor\@\@\@Z */ - MCAPI void sendBlockExploded(class BlockPos const &, class Block const &, class Actor *); + MCAPI void sendBlockExploded(class Dimension &, class BlockPos const &, class Block const &, class Actor *); /** * @symbol ?sendBlockInPosWillBeDestroyedByPlayer\@BlockEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockEventListener.hpp b/LiteLoader/include/llapi/mc/BlockEventListener.hpp index 4ff69170cb..e28ae6128e 100644 --- a/LiteLoader/include/llapi/mc/BlockEventListener.hpp +++ b/LiteLoader/include/llapi/mc/BlockEventListener.hpp @@ -43,9 +43,9 @@ class BlockEventListener { */ MCVAPI enum class EventResult onBlockDestructionStopped(class Player &, class BlockPos const &, int); /** - * @symbol ?onBlockExploded\@BlockEventListener\@\@UEAA?AW4EventResult\@\@AEBVBlockPos\@\@AEBVBlock\@\@PEAVActor\@\@\@Z + * @symbol ?onBlockExploded\@BlockEventListener\@\@UEAA?AW4EventResult\@\@AEAVDimension\@\@AEBVBlockPos\@\@AEBVBlock\@\@PEAVActor\@\@\@Z */ - MCVAPI enum class EventResult onBlockExploded(class BlockPos const &, class Block const &, class Actor *); + MCVAPI enum class EventResult onBlockExploded(class Dimension &, class BlockPos const &, class Block const &, class Actor *); /** * @symbol ?onBlockInPosWillBeDestroyedByPlayer\@BlockEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockEventPacket.hpp b/LiteLoader/include/llapi/mc/BlockEventPacket.hpp index 9890f7e9a3..b1b4a78121 100644 --- a/LiteLoader/include/llapi/mc/BlockEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/BlockEventPacket.hpp @@ -51,9 +51,9 @@ class BlockEventPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@BlockEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@BlockEventPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKEVENTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/BlockFrictionDescription.hpp b/LiteLoader/include/llapi/mc/BlockFrictionDescription.hpp index 49433afe1b..9ddf78a575 100644 --- a/LiteLoader/include/llapi/mc/BlockFrictionDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockFrictionDescription.hpp @@ -48,16 +48,21 @@ struct BlockFrictionDescription { virtual void __unk_vfn_3(); /** * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); + /** + * @vftbl 5 * @symbol ?isNetworkComponent\@BlockFrictionDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 + * @vftbl 6 * @symbol ?buildNetworkTag\@BlockFrictionDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?initializeFromNetwork\@BlockFrictionDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/BlockGeometryDescription.hpp b/LiteLoader/include/llapi/mc/BlockGeometryDescription.hpp index 5084f58eaf..a7ac8508f2 100644 --- a/LiteLoader/include/llapi/mc/BlockGeometryDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockGeometryDescription.hpp @@ -42,29 +42,44 @@ struct BlockGeometryDescription { virtual void initializeComponent(class EntityContext &) const; /** * @vftbl 3 - * @symbol __unk_vfn_3 + * @symbol ?initializeComponentFromCode\@BlockGeometryDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ - virtual void __unk_vfn_3(); + virtual void initializeComponentFromCode(class EntityContext &) const; /** * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); + /** + * @vftbl 5 * @symbol ?isNetworkComponent\@BlockGeometryDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 + * @vftbl 6 * @symbol ?buildNetworkTag\@BlockGeometryDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?initializeFromNetwork\@BlockGeometryDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); /** - * @vftbl 7 + * @vftbl 8 * @symbol ?handleVersionBasedInitialization\@BlockGeometryDescription\@\@UEAAXAEBVSemVersion\@\@\@Z */ virtual void handleVersionBasedInitialization(class SemVersion const &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKGEOMETRYDESCRIPTION + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BlockGeometryDescription(); +#endif + /** + * @symbol ??0BlockGeometryDescription\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI BlockGeometryDescription(std::string const &); /** * @symbol ??0BlockGeometryDescription\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BlockItem.hpp b/LiteLoader/include/llapi/mc/BlockItem.hpp index d7aa023391..21c9535047 100644 --- a/LiteLoader/include/llapi/mc/BlockItem.hpp +++ b/LiteLoader/include/llapi/mc/BlockItem.hpp @@ -36,11 +36,6 @@ class BlockItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class BlockItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -117,27 +117,37 @@ class BlockItem : public Item { */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 118 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 120 * @symbol ?getIconInfo\@BlockItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 122 + * @vftbl 124 * @symbol ?getLightEmission\@BlockItem\@\@UEBA?AUBrightness\@\@H\@Z */ virtual struct Brightness getLightEmission(int) const; /** - * @vftbl 123 + * @vftbl 125 * @symbol ?getIconYOffset\@BlockItem\@\@UEBAHXZ */ virtual int getIconYOffset() const; /** - * @vftbl 131 + * @vftbl 133 * @symbol ?_calculatePlacePos\@BlockItem\@\@MEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 132 + * @vftbl 134 * @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 26b1599599..aab04c4673 100644 --- a/LiteLoader/include/llapi/mc/BlockLegacy.hpp +++ b/LiteLoader/include/llapi/mc/BlockLegacy.hpp @@ -24,6 +24,7 @@ class BlockLegacy { // Add new members to class public: struct NameInfo; + struct HorizontalDirectionBits; LIAPI Block* toBlock(unsigned short tileData); LIAPI string getTypeName(); @@ -170,19 +171,19 @@ class BlockLegacy { virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; /** * @vftbl 26 - * @symbol ?getConnectedDirections\@BlockLegacy\@\@UEBAXAEBVBlock\@\@AEBVBlockPos\@\@AEBVIConstBlockSource\@\@AEA_N333\@Z - */ - virtual void getConnectedDirections(class Block const &, class BlockPos const &, class IConstBlockSource const &, bool &, bool &, bool &, bool &) const; - /** - * @vftbl 27 * @symbol ?isAir\@BlockLegacy\@\@UEBA_NXZ */ virtual bool isAir() const; /** - * @vftbl 28 + * @vftbl 27 * @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 @@ -190,14 +191,14 @@ class BlockLegacy { virtual void __unk_vfn_29(); /** * @vftbl 30 - * @symbol __unk_vfn_30 + * @symbol ?isClimbable\@BlockLegacy\@\@UEBA_NAEBUIActorMovementProxy\@\@\@Z */ - virtual void __unk_vfn_30(); + virtual bool isClimbable(struct IActorMovementProxy const &) const; /** * @vftbl 31 - * @symbol ?isClimbable\@BlockLegacy\@\@UEBA_NAEBUIActorMovementProxy\@\@\@Z + * @symbol __unk_vfn_31 */ - virtual bool isClimbable(struct IActorMovementProxy const &) const; + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -210,14 +211,14 @@ class BlockLegacy { virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol __unk_vfn_34 + * @symbol ?isWaterBlocking\@BlockLegacy\@\@UEBA_NXZ */ - virtual void __unk_vfn_34(); + virtual bool isWaterBlocking() const; /** * @vftbl 35 - * @symbol ?isWaterBlocking\@BlockLegacy\@\@UEBA_NXZ + * @symbol __unk_vfn_35 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -250,14 +251,14 @@ class BlockLegacy { virtual void __unk_vfn_41(); /** * @vftbl 42 - * @symbol __unk_vfn_42 + * @symbol ?isDoubleSlabBlock\@BlockLegacy\@\@UEBA_NXZ */ - virtual void __unk_vfn_42(); + virtual bool isDoubleSlabBlock() const; /** * @vftbl 43 - * @symbol ?isDoubleSlabBlock\@BlockLegacy\@\@UEBA_NXZ + * @symbol __unk_vfn_43 */ - virtual bool isDoubleSlabBlock() const; + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -285,59 +286,59 @@ class BlockLegacy { virtual void __unk_vfn_48(); /** * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 50 * @symbol ?canHurtAndBreakItem\@BlockLegacy\@\@UEBA_NXZ */ virtual bool canHurtAndBreakItem() const; /** - * @vftbl 51 + * @vftbl 50 * @symbol ?isSignalSource\@BlockLegacy\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 52 + * @vftbl 51 * @symbol ?canBeOriginalSurface\@BlockLegacy\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 53 + * @vftbl 52 * @symbol ?canBeAscendedByJumping\@BlockLegacy\@\@UEBA_NAEBVActor\@\@AEBVBlockPos\@\@\@Z */ virtual bool canBeAscendedByJumping(class Actor const &, class BlockPos const &) const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_53(); /** - * @vftbl 55 + * @vftbl 54 * @symbol ?isValidAuxValue\@BlockLegacy\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 56 + * @vftbl 55 * @symbol ?canFillAtPos\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canFillAtPos(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 57 + * @vftbl 56 * @symbol ?sanitizeFillBlock\@BlockLegacy\@\@UEBAAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBV2\@\@Z */ virtual class Block const & sanitizeFillBlock(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 58 + * @vftbl 57 * @symbol ?onFillBlock\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void onFillBlock(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 59 + * @vftbl 58 * @symbol ?getDirectSignal\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual int getDirectSignal(class BlockSource &, class BlockPos const &, int) const; + /** + * @vftbl 59 + * @symbol __unk_vfn_59 + */ + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -345,314 +346,314 @@ class BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@BlockLegacy\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 63 + * @vftbl 62 * @symbol ?getRequiredMedium\@BlockLegacy\@\@UEBA?AV?$optional\@VHashedString\@\@\@std\@\@XZ */ virtual class std::optional getRequiredMedium() const; /** - * @vftbl 64 + * @vftbl 63 * @symbol ?shouldConnectToRedstone\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 65 + * @vftbl 64 * @symbol ?handlePrecipitation\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@MM\@Z */ virtual void handlePrecipitation(class BlockSource &, class BlockPos const &, float, float) const; /** - * @vftbl 66 + * @vftbl 65 * @symbol ?canBeUsedInCommands\@BlockLegacy\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 67 + * @vftbl 66 * @symbol ?getThickness\@BlockLegacy\@\@UEBAMXZ */ virtual float getThickness() const; /** - * @vftbl 68 + * @vftbl 67 * @symbol ?getFlexibility\@BlockLegacy\@\@UEBAMAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual float getFlexibility(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 69 + * @vftbl 68 * @symbol ?checkIsPathable\@BlockLegacy\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 70 + * @vftbl 69 * @symbol ?shouldDispense\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@\@Z */ virtual bool shouldDispense(class BlockSource &, class Container &) const; /** - * @vftbl 71 + * @vftbl 70 * @symbol ?dispense\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 72 + * @vftbl 71 * @symbol ?transformOnFall\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@M\@Z */ virtual void transformOnFall(class BlockSource &, class BlockPos const &, class Actor *, float) const; /** - * @vftbl 73 + * @vftbl 72 * @symbol ?onRedstoneUpdate\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 74 + * @vftbl 73 * @symbol ?onMove\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void onMove(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 76 + * @vftbl 75 * @symbol ?movedByPiston\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void movedByPiston(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 77 + * @vftbl 76 * @symbol ?onStructureBlockPlace\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onStructureBlockPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 78 + * @vftbl 77 * @symbol ?onStructureNeighborBlockPlace\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onStructureNeighborBlockPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 80 + * @vftbl 79 * @symbol ?getRedstoneProperty\@BlockLegacy\@\@UEBA?AW4BlockProperty\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockProperty getRedstoneProperty(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 + * @vftbl 80 * @symbol ?updateEntityAfterFallOn\@BlockLegacy\@\@UEBAXAEBVBlockPos\@\@AEAUUpdateEntityAfterFallOnInterface\@\@\@Z */ virtual void updateEntityAfterFallOn(class BlockPos const &, struct UpdateEntityAfterFallOnInterface &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 83 + * @vftbl 82 * @symbol ?isFilteredOut\@BlockLegacy\@\@UEBA_NW4BlockRenderLayer\@\@\@Z */ virtual bool isFilteredOut(enum class BlockRenderLayer) const; /** - * @vftbl 84 + * @vftbl 83 * @symbol ?isPreservingMediumWhenPlaced\@BlockLegacy\@\@UEBA_NPEBV1\@\@Z */ virtual bool isPreservingMediumWhenPlaced(class BlockLegacy const *) const; /** - * @vftbl 85 + * @vftbl 84 * @symbol ?ignoreEntitiesOnPistonMove\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool ignoreEntitiesOnPistonMove(class Block const &) const; /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 86 * @symbol ?mayConsumeFertilizer\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 89 + * @vftbl 88 * @symbol ?mayPick\@BlockLegacy\@\@UEBA_NXZ */ virtual bool mayPick() const; /** - * @vftbl 90 + * @vftbl 89 * @symbol ?mayPick\@BlockLegacy\@\@UEBA_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z */ virtual bool mayPick(class BlockSource const &, class Block const &, bool) const; /** - * @vftbl 91 + * @vftbl 90 * @symbol ?mayPlace\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 93 + * @vftbl 92 * @symbol ?mayPlaceOn\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 94 + * @vftbl 93 * @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 95 + * @vftbl 94 * @symbol ?tryToTill\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@AEAVItemStack\@\@\@Z */ virtual bool tryToTill(class BlockSource &, class BlockPos const &, class Actor &, class ItemStack &) const; /** - * @vftbl 96 + * @vftbl 95 * @symbol ?breaksFallingBlocks\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 97 + * @vftbl 96 * @symbol ?destroy\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@PEAVActor\@\@\@Z */ virtual void destroy(class BlockSource &, class BlockPos const &, class Block const &, class Actor *) const; /** - * @vftbl 98 + * @vftbl 97 * @symbol ?getIgnoresDestroyPermissions\@BlockLegacy\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@\@Z */ virtual bool getIgnoresDestroyPermissions(class Actor &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 100 + * @vftbl 99 * @symbol ?getSecondPart\@BlockLegacy\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool getSecondPart(class BlockSource const &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 101 + * @vftbl 100 * @symbol ?playerWillDestroy\@BlockLegacy\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 102 + * @vftbl 101 * @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 103 + * @vftbl 102 * @symbol ?asItemInstance\@BlockLegacy\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 + * @vftbl 103 * @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 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 107 + * @vftbl 106 * @symbol ?calcVariant\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVColor\@mce\@\@\@Z */ virtual int calcVariant(class BlockSource &, class BlockPos const &, class mce::Color const &) const; /** - * @vftbl 108 + * @vftbl 107 * @symbol ?isAttachedTo\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool isAttachedTo(class BlockSource &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 109 + * @vftbl 108 * @symbol ?attack\@BlockLegacy\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ virtual bool attack(class Player *, class BlockPos const &) const; /** - * @vftbl 110 + * @vftbl 109 * @symbol ?handleEntityInside\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@AEAVVec3\@\@\@Z */ virtual void handleEntityInside(class BlockSource &, class BlockPos const &, class Actor *, class Vec3 &) const; /** - * @vftbl 111 + * @vftbl 110 * @symbol ?shouldTriggerOnStandOn\@BlockLegacy\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@\@Z */ virtual bool shouldTriggerOnStandOn(class Actor &, class BlockPos const &) const; /** - * @vftbl 112 + * @vftbl 111 * @symbol ?shouldTriggerEntityInside\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual bool shouldTriggerEntityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 113 + * @vftbl 112 * @symbol ?entityInside\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 114 + * @vftbl 113 * @symbol ?canBeBuiltOver\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlockItem\@\@\@Z */ virtual bool canBeBuiltOver(class BlockSource &, class BlockPos const &, class BlockItem const &) const; /** - * @vftbl 115 + * @vftbl 114 * @symbol ?canBeBuiltOver\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canBeBuiltOver(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 116 + * @vftbl 115 * @symbol ?triggerEvent\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z */ virtual void triggerEvent(class BlockSource &, class BlockPos const &, int, int) const; /** - * @vftbl 117 + * @vftbl 116 * @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 118 + * @vftbl 117 * @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 119 + * @vftbl 118 * @symbol ?executeTrigger\@BlockLegacy\@\@UEBA_NAEBVDefinitionTrigger\@\@AEAVRenderParams\@\@\@Z */ virtual bool executeTrigger(class DefinitionTrigger const &, class RenderParams &) const; /** - * @vftbl 120 + * @vftbl 119 * @symbol ?forceExecuteTrigger\@BlockLegacy\@\@UEBAXAEBVDefinitionTrigger\@\@AEAVRenderParams\@\@\@Z */ virtual void forceExecuteTrigger(class DefinitionTrigger const &, class RenderParams &) const; /** - * @vftbl 121 + * @vftbl 120 * @symbol ?getMobToSpawn\@BlockLegacy\@\@UEBAPEBVMobSpawnerData\@\@AEBVSpawnConditions\@\@AEAVBlockSource\@\@\@Z */ virtual class MobSpawnerData const * getMobToSpawn(class SpawnConditions const &, class BlockSource &) const; /** - * @vftbl 122 + * @vftbl 121 * @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 @@ -660,356 +661,351 @@ class BlockLegacy { virtual void __unk_vfn_123(); /** * @vftbl 124 - * @symbol ?calcGroundFriction\@BlockLegacy\@\@UEBAMAEBUIMobMovementProxy\@\@AEBVBlockPos\@\@\@Z + * @symbol __unk_vfn_124 */ - virtual float calcGroundFriction(struct IMobMovementProxy const &, class BlockPos const &) const; + virtual void __unk_vfn_124(); /** * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 - */ - virtual void __unk_vfn_126(); - /** - * @vftbl 127 * @symbol ?getComparatorSignal\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 128 + * @vftbl 126 * @symbol ?canSlide\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSlide(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 130 + * @vftbl 128 * @symbol ?canSpawnAt\@BlockLegacy\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSpawnAt(class BlockSource const &, class BlockPos const &) const; /** - * @vftbl 131 + * @vftbl 129 * @symbol ?notifySpawnedAt\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void notifySpawnedAt(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 133 + * @vftbl 131 * @symbol ?getIconYOffset\@BlockLegacy\@\@UEBAHXZ */ virtual int getIconYOffset() const; /** - * @vftbl 134 + * @vftbl 132 * @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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@BlockLegacy\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 136 + * @vftbl 134 * @symbol ?getColor\@BlockLegacy\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 137 + * @vftbl 135 * @symbol ?getColor\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 138 + * @vftbl 136 * @symbol ?getColorAtPos\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getColorAtPos(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 139 + * @vftbl 137 * @symbol ?getColorForParticle\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColorForParticle(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 140 + * @vftbl 138 * @symbol ?isSeasonTinted\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isSeasonTinted(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 141 + * @vftbl 139 * @symbol ?onGraphicsModeChanged\@BlockLegacy\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 142 + * @vftbl 140 * @symbol ?getShadeBrightness\@BlockLegacy\@\@UEBAMAEBVBlock\@\@\@Z */ virtual float getShadeBrightness(class Block const &) const; /** - * @vftbl 143 + * @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 144 + * @vftbl 142 * @symbol ?getVisualShape\@BlockLegacy\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getUIShape\@BlockLegacy\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ virtual class AABB const & getUIShape(class Block const &, class AABB &) const; /** - * @vftbl 146 + * @vftbl 144 * @symbol ?telemetryVariant\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int telemetryVariant(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@BlockLegacy\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 148 + * @vftbl 146 * @symbol ?canSpawnOn\@BlockLegacy\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 149 + * @vftbl 147 * @symbol ?getRenderBlock\@BlockLegacy\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getRenderBlock() const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?getMappedFace\@BlockLegacy\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 151 + * @vftbl 149 * @symbol ?getFaceFlip\@BlockLegacy\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z */ virtual enum class Flip getFaceFlip(unsigned char, class Block const &) const; /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 153 + * @vftbl 151 * @symbol ?init\@BlockLegacy\@\@UEAAAEAV1\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 154 + * @vftbl 152 * @symbol ?getLightEmission\@BlockLegacy\@\@MEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 155 + * @vftbl 153 * @symbol ?addState\@BlockLegacy\@\@UEAAAEAV1\@AEBVBlockState\@\@\@Z */ virtual class BlockLegacy & addState(class BlockState const &); /** - * @vftbl 156 + * @vftbl 154 * @symbol ?addState\@BlockLegacy\@\@UEAAAEAV1\@AEBVBlockState\@\@_K\@Z */ virtual class BlockLegacy & addState(class BlockState const &, unsigned __int64); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 158 + * @vftbl 156 * @symbol ?tryLegacyUpgrade\@BlockLegacy\@\@UEBAPEBVBlock\@\@G\@Z */ virtual class Block const * tryLegacyUpgrade(unsigned short) const; /** - * @vftbl 159 + * @vftbl 157 * @symbol ?dealsContactDamage\@BlockLegacy\@\@UEBA_NAEBVActor\@\@AEBVBlock\@\@_N\@Z */ virtual bool dealsContactDamage(class Actor const &, class Block const &, bool) const; /** - * @vftbl 160 + * @vftbl 158 * @symbol ?tryGetInfested\@BlockLegacy\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetInfested(class Block const &) const; /** - * @vftbl 161 + * @vftbl 159 * @symbol ?tryGetUninfested\@BlockLegacy\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetUninfested(class Block const &) const; /** - * @vftbl 162 + * @vftbl 160 * @symbol ?_addHardCodedBlockComponents\@BlockLegacy\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 + * @vftbl 162 * @symbol ?onExploded\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ virtual void onExploded(class BlockSource &, class BlockPos const &, class Actor *) const; /** - * @vftbl 165 + * @vftbl 163 * @symbol ?onStandOn\@BlockLegacy\@\@MEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ virtual void onStandOn(class EntityContext &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 + * @vftbl 168 * @symbol ?onFallOn\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 + * @vftbl 171 * @symbol ?randomTick\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 + * @vftbl 172 * @symbol ?shouldRandomTick\@BlockLegacy\@\@MEBA_NXZ */ virtual bool shouldRandomTick() const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 176 + * @vftbl 174 * @symbol ?clip\@BlockLegacy\@\@MEBA?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 + * @vftbl 175 * @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 178 + * @vftbl 176 * @symbol ?use\@BlockLegacy\@\@MEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@BlockLegacy\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 181 + * @vftbl 179 * @symbol ?getRenderLayer\@BlockLegacy\@\@MEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 182 + * @vftbl 180 * @symbol ?getRenderLayer\@BlockLegacy\@\@MEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 183 + * @vftbl 181 * @symbol ?getExtraRenderLayers\@BlockLegacy\@\@MEBAHXZ */ virtual int getExtraRenderLayers() const; /** - * @vftbl 184 + * @vftbl 182 * @symbol ?getExplosionResistance\@BlockLegacy\@\@MEBAMXZ */ virtual float getExplosionResistance() const; /** - * @vftbl 185 + * @vftbl 183 + * @symbol ?getLight\@BlockLegacy\@\@MEBA?AUBrightness\@\@AEBVBlock\@\@\@Z + */ + virtual struct Brightness getLight(class Block const &) const; + /** + * @vftbl 184 * @symbol ?getEmissiveBrightness\@BlockLegacy\@\@MEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getEmissiveBrightness(class Block const &) const; /** - * @vftbl 186 + * @vftbl 185 * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 + * @vftbl 187 * @symbol ?playerDestroy\@BlockLegacy\@\@MEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@BlockLegacy\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@BlockLegacy\@\@MEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@BlockLegacy\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 192 + * @vftbl 191 * @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 193 + * @vftbl 192 * @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 194 + * @vftbl 193 * @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; @@ -1187,18 +1183,30 @@ class BlockLegacy { * @symbol ?addBlockProperties\@BlockLegacy\@\@QEAAAEAV1\@W4BlockProperty\@\@\@Z */ MCAPI class BlockLegacy & addBlockProperties(enum class BlockProperty); + /** + * @symbol ?addComponent\@BlockLegacy\@\@QEAAAEAV1\@AEBUBlockComponentDescription\@\@\@Z + */ + MCAPI class BlockLegacy & addComponent(struct BlockComponentDescription const &); + /** + * @symbol ?addGetPlacementBlockCallback\@BlockLegacy\@\@QEAAXV?$unique_ptr\@VIGetPlacementBlockCallback\@BlockTrait\@\@U?$default_delete\@VIGetPlacementBlockCallback\@BlockTrait\@\@\@std\@\@\@std\@\@\@Z + */ + MCAPI void addGetPlacementBlockCallback(std::unique_ptr); /** * @symbol ?addTag\@BlockLegacy\@\@QEAAAEAV1\@AEBVHashedString\@\@\@Z */ MCAPI class BlockLegacy & addTag(class HashedString const &); /** - * @symbol ?anyOf\@BlockLegacy\@\@QEBA_NAEBV?$vector\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?addTrait\@BlockLegacy\@\@QEAAAEAV1\@AEBVITrait\@BlockTrait\@\@\@Z */ - MCAPI bool anyOf(std::vector> const &) const; + MCAPI class BlockLegacy & addTrait(class BlockTrait::ITrait 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 + */ + MCAPI bool anyOf(std::vector> const &) const; /** * @symbol ?createBlockPermutations\@BlockLegacy\@\@QEAAXI\@Z */ @@ -1447,14 +1455,14 @@ class BlockLegacy { * @symbol ?setSolid\@BlockLegacy\@\@QEAAX_N\@Z */ MCAPI void setSolid(bool); - /** - * @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 ?setVisualShape\@BlockLegacy\@\@QEAAXAEBVAABB\@\@\@Z + */ + MCAPI void setVisualShape(class AABB const &); /** * @symbol ?tryGetStateFromLegacyData\@BlockLegacy\@\@QEBAPEBVBlock\@\@G_N\@Z */ @@ -1475,6 +1483,10 @@ class BlockLegacy { * @symbol ?extractBlockNameInfo\@BlockLegacy\@\@SA?AUNameInfo\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static struct BlockLegacy::NameInfo extractBlockNameInfo(std::string const &); + /** + * @symbol ?getConnectedDirections\@BlockLegacy\@\@SA?AUHorizontalDirectionBits\@1\@AEBVBlock\@\@AEBVBlockPos\@\@AEBVIConstBlockSource\@\@\@Z + */ + MCAPI static struct BlockLegacy::HorizontalDirectionBits getConnectedDirections(class Block const &, class BlockPos const &, class IConstBlockSource const &); /** * @symbol ?getPlacementFacingAll\@BlockLegacy\@\@SAEAEBVActor\@\@AEBVBlockPos\@\@M\@Z */ @@ -1483,14 +1495,14 @@ 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\@\@AEBVItemStack\@\@\@Z - */ - MCAPI static class ItemActor * popResource(class BlockSource &, class BlockPos const &, class ItemStack const &); /** * @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 */ diff --git a/LiteLoader/include/llapi/mc/BlockLightDampeningDescription.hpp b/LiteLoader/include/llapi/mc/BlockLightDampeningDescription.hpp index 9da575b8d1..69b9da9b64 100644 --- a/LiteLoader/include/llapi/mc/BlockLightDampeningDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockLightDampeningDescription.hpp @@ -46,16 +46,21 @@ struct BlockLightDampeningDescription { virtual void __unk_vfn_3(); /** * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); + /** + * @vftbl 5 * @symbol ?isNetworkComponent\@BlockLightDampeningDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 + * @vftbl 6 * @symbol ?buildNetworkTag\@BlockLightDampeningDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?initializeFromNetwork\@BlockLightDampeningDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/BlockLightEmissionDescription.hpp b/LiteLoader/include/llapi/mc/BlockLightEmissionDescription.hpp index e4dc65af66..586de958f1 100644 --- a/LiteLoader/include/llapi/mc/BlockLightEmissionDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockLightEmissionDescription.hpp @@ -48,16 +48,21 @@ struct BlockLightEmissionDescription { virtual void __unk_vfn_3(); /** * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); + /** + * @vftbl 5 * @symbol ?isNetworkComponent\@BlockLightEmissionDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 + * @vftbl 6 * @symbol ?buildNetworkTag\@BlockLightEmissionDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?initializeFromNetwork\@BlockLightEmissionDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/BlockListSerializer.hpp b/LiteLoader/include/llapi/mc/BlockListSerializer.hpp index 2589a7126b..c7cac99be4 100644 --- a/LiteLoader/include/llapi/mc/BlockListSerializer.hpp +++ b/LiteLoader/include/llapi/mc/BlockListSerializer.hpp @@ -30,14 +30,14 @@ class BlockListSerializer { #endif public: - /** - * @symbol ?loadJSON\@BlockListSerializer\@\@SAXVValue\@Json\@\@AEBVSemVersion\@\@AEAVBlockDescriptor\@\@\@Z - */ - MCAPI static void loadJSON(class Json::Value, class SemVersion const &, class BlockDescriptor &); /** * @symbol ?loadJSON\@BlockListSerializer\@\@SAXVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@\@Z */ MCAPI static void loadJSON(class Json::Value, class SemVersion const &, std::vector &); + /** + * @symbol ?loadJSON\@BlockListSerializer\@\@SAXVValue\@Json\@\@AEBVSemVersion\@\@AEAVBlockDescriptor\@\@\@Z + */ + MCAPI static void loadJSON(class Json::Value, class SemVersion const &, class BlockDescriptor &); /** * @symbol ?saveJSON\@BlockListSerializer\@\@SAXAEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@AEAVValue\@Json\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockMaterialInstancesDescription.hpp b/LiteLoader/include/llapi/mc/BlockMaterialInstancesDescription.hpp index b633f99210..4c0d778fcf 100644 --- a/LiteLoader/include/llapi/mc/BlockMaterialInstancesDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockMaterialInstancesDescription.hpp @@ -22,6 +22,7 @@ struct BlockMaterialInstancesDescription { public: struct BlockMaterialInstancesDescription& operator=(struct BlockMaterialInstancesDescription const &) = delete; BlockMaterialInstancesDescription(struct BlockMaterialInstancesDescription const &) = delete; + BlockMaterialInstancesDescription() = delete; #endif public: @@ -42,28 +43,39 @@ struct BlockMaterialInstancesDescription { virtual void initializeComponent(class EntityContext &) const; /** * @vftbl 3 - * @symbol __unk_vfn_3 + * @symbol ?initializeComponentFromCode\@BlockMaterialInstancesDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ - virtual void __unk_vfn_3(); + virtual void initializeComponentFromCode(class EntityContext &) const; /** * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); + /** + * @vftbl 5 * @symbol ?isNetworkComponent\@BlockMaterialInstancesDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 + * @vftbl 6 * @symbol ?buildNetworkTag\@BlockMaterialInstancesDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?initializeFromNetwork\@BlockMaterialInstancesDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKMATERIALINSTANCESDESCRIPTION + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BlockMaterialInstancesDescription(); +#endif /** - * @symbol ??0BlockMaterialInstancesDescription\@\@QEAA\@XZ + * @symbol ??0BlockMaterialInstancesDescription\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4BlockRenderLayer\@\@_N2\@Z */ - MCAPI BlockMaterialInstancesDescription(); + MCAPI BlockMaterialInstancesDescription(std::string const &, enum class BlockRenderLayer, bool, bool); /** * @symbol ?NameID\@BlockMaterialInstancesDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ diff --git a/LiteLoader/include/llapi/mc/BlockMenuCategory.hpp b/LiteLoader/include/llapi/mc/BlockMenuCategory.hpp new file mode 100644 index 0000000000..9fe97b3429 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockMenuCategory.hpp @@ -0,0 +1,32 @@ +/** + * @file BlockMenuCategory.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct BlockMenuCategory { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKMENUCATEGORY +public: + struct BlockMenuCategory& operator=(struct BlockMenuCategory const &) = delete; + BlockMenuCategory(struct BlockMenuCategory const &) = delete; + BlockMenuCategory() = delete; +#endif + +public: + /** + * @symbol ??1BlockMenuCategory\@\@QEAA\@XZ + */ + MCAPI ~BlockMenuCategory(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockPatternBuilder.hpp b/LiteLoader/include/llapi/mc/BlockPatternBuilder.hpp index e4b90f25e0..04d5f0015a 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\@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 ?define\@BlockPatternBuilder\@\@QEAAAEAV1\@DAEBVBlock\@\@\@Z + */ + MCAPI class BlockPatternBuilder & define(char, class Block const &); /** * @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\@\@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 ?match\@BlockPatternBuilder\@\@QEAA?AUBuildMatch\@\@AEBVBlockPos\@\@HH\@Z + */ + MCAPI struct BuildMatch match(class BlockPos const &, int, int); /** * @symbol ?replaceBlocks\@BlockPatternBuilder\@\@QEAAXDUBuildMatch\@\@AEBVBlock\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockPickRequestPacket.hpp b/LiteLoader/include/llapi/mc/BlockPickRequestPacket.hpp index 2c1ad3413e..283ebdec06 100644 --- a/LiteLoader/include/llapi/mc/BlockPickRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/BlockPickRequestPacket.hpp @@ -51,9 +51,9 @@ class BlockPickRequestPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@BlockPickRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@BlockPickRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0BlockPickRequestPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BlockPlacementFilterComponent.hpp b/LiteLoader/include/llapi/mc/BlockPlacementFilterComponent.hpp index fa408f10a2..6f4b4a095a 100644 --- a/LiteLoader/include/llapi/mc/BlockPlacementFilterComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockPlacementFilterComponent.hpp @@ -29,14 +29,14 @@ struct BlockPlacementFilterComponent { #endif public: - /** - * @symbol ?mayPlace\@BlockPlacementFilterComponent\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z - */ - MCAPI bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** * @symbol ?mayPlace\@BlockPlacementFilterComponent\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool mayPlace(class BlockSource &, class BlockPos const &) const; + /** + * @symbol ?mayPlace\@BlockPlacementFilterComponent\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + */ + MCAPI bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** * @symbol ??4BlockPlacementFilterComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockPlacementFilterDescription.hpp b/LiteLoader/include/llapi/mc/BlockPlacementFilterDescription.hpp index 0e76de7838..d986ad491d 100644 --- a/LiteLoader/include/llapi/mc/BlockPlacementFilterDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockPlacementFilterDescription.hpp @@ -48,16 +48,21 @@ struct BlockPlacementFilterDescription { virtual void __unk_vfn_3(); /** * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); + /** + * @vftbl 5 * @symbol ?isNetworkComponent\@BlockPlacementFilterDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 + * @vftbl 6 * @symbol ?buildNetworkTag\@BlockPlacementFilterDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 7 * @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 f6b71b91d0..f498c7dcd8 100644 --- a/LiteLoader/include/llapi/mc/BlockPlanterItem.hpp +++ b/LiteLoader/include/llapi/mc/BlockPlanterItem.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 BlockPlanterItem. * */ -class BlockPlanterItem : public Item { +class BlockPlanterItem : public ComponentItem { #define AFTER_EXTRA // Add Member There @@ -37,20 +37,15 @@ class BlockPlanterItem : public Item { */ virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 3 + * @symbol ?setDescriptionId\@BlockPlanterItem\@\@UEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - virtual void __unk_vfn_7(); + virtual class BlockPlanterItem & setDescriptionId(std::string const &); /** * @vftbl 11 * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); - /** - * @vftbl 13 - * @symbol ?isBlockPlanterItem\@BlockPlanterItem\@\@UEBA_NXZ - */ - virtual bool isBlockPlanterItem() const; /** * @vftbl 14 * @symbol __unk_vfn_14 @@ -61,6 +56,11 @@ class BlockPlanterItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -107,15 +107,30 @@ class BlockPlanterItem : public Item { */ virtual void __unk_vfn_80(); /** - * @vftbl 131 - * @symbol ?_calculatePlacePos\@BlockPlanterItem\@\@MEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z + * @vftbl 95 + * @symbol ?buildDescriptionId\@BlockPlanterItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + */ + virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; + /** + * @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\@BlockPlanterItem\@\@UEAAAEAVItem\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ - virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; + virtual class Item & setIconInfo(std::string const &, int); /** - * @vftbl 132 - * @symbol ?_useOn\@BlockPlanterItem\@\@MEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 120 + * @symbol ?getIconInfo\@BlockPlanterItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ - virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** * @symbol ??0BlockPlanterItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVBlock\@\@_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockQueuedTickingDescription.hpp b/LiteLoader/include/llapi/mc/BlockQueuedTickingDescription.hpp index b7317145e7..836cacfdb1 100644 --- a/LiteLoader/include/llapi/mc/BlockQueuedTickingDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockQueuedTickingDescription.hpp @@ -22,7 +22,6 @@ struct BlockQueuedTickingDescription { public: struct BlockQueuedTickingDescription& operator=(struct BlockQueuedTickingDescription const &) = delete; BlockQueuedTickingDescription(struct BlockQueuedTickingDescription const &) = delete; - BlockQueuedTickingDescription() = delete; #endif public: @@ -41,6 +40,10 @@ struct BlockQueuedTickingDescription { * @symbol ?initializeComponent\@BlockQueuedTickingDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; + /** + * @symbol ??0BlockQueuedTickingDescription\@\@QEAA\@XZ + */ + MCAPI BlockQueuedTickingDescription(); /** * @symbol ?NameID\@BlockQueuedTickingDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ diff --git a/LiteLoader/include/llapi/mc/BlockRotationComponent.hpp b/LiteLoader/include/llapi/mc/BlockRotationComponent.hpp deleted file mode 100644 index f65fe0eda2..0000000000 --- a/LiteLoader/include/llapi/mc/BlockRotationComponent.hpp +++ /dev/null @@ -1,41 +0,0 @@ -/** - * @file BlockRotationComponent.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 BlockRotationComponent. - * - */ -struct BlockRotationComponent { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKROTATIONCOMPONENT -public: - struct BlockRotationComponent& operator=(struct BlockRotationComponent const &) = delete; - BlockRotationComponent(struct BlockRotationComponent const &) = delete; - BlockRotationComponent() = delete; -#endif - -public: - /** - * @symbol ??0BlockRotationComponent\@\@QEAA\@AEBVVec3\@\@\@Z - */ - MCAPI BlockRotationComponent(class Vec3 const &); - /** - * @symbol ?setRotationDegrees\@BlockRotationComponent\@\@QEAAXAEBVVec3\@\@\@Z - */ - MCAPI void setRotationDegrees(class Vec3 const &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockRotationDescription.hpp b/LiteLoader/include/llapi/mc/BlockRotationDescription.hpp deleted file mode 100644 index 78ce7c6bdb..0000000000 --- a/LiteLoader/include/llapi/mc/BlockRotationDescription.hpp +++ /dev/null @@ -1,76 +0,0 @@ -/** - * @file BlockRotationDescription.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 BlockRotationDescription. - * - */ -struct BlockRotationDescription { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKROTATIONDESCRIPTION -public: - struct BlockRotationDescription& operator=(struct BlockRotationDescription const &) = delete; - BlockRotationDescription(struct BlockRotationDescription const &) = delete; - BlockRotationDescription() = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?getName\@BlockRotationDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - virtual std::string const & getName() const; - /** - * @vftbl 2 - * @symbol ?initializeComponent\@BlockRotationDescription\@\@UEBAXAEAVEntityContext\@\@\@Z - */ - virtual void initializeComponent(class EntityContext &) const; - /** - * @vftbl 3 - * @symbol __unk_vfn_3 - */ - virtual void __unk_vfn_3(); - /** - * @vftbl 4 - * @symbol ?isNetworkComponent\@BlockRotationDescription\@\@UEBA_NXZ - */ - virtual bool isNetworkComponent() const; - /** - * @vftbl 5 - * @symbol ?buildNetworkTag\@BlockRotationDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ - */ - virtual std::unique_ptr buildNetworkTag() const; - /** - * @vftbl 6 - * @symbol ?initializeFromNetwork\@BlockRotationDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z - */ - virtual void initializeFromNetwork(class CompoundTag const &); - /** - * @symbol ?NameID\@BlockRotationDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B - */ - MCAPI static std::string const NameID; - /** - * @symbol ?bindType\@BlockRotationDescription\@\@SAXXZ - */ - MCAPI static void bindType(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockRotationHelpers.hpp b/LiteLoader/include/llapi/mc/BlockRotationHelpers.hpp deleted file mode 100644 index ddbd293303..0000000000 --- a/LiteLoader/include/llapi/mc/BlockRotationHelpers.hpp +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file BlockRotationHelpers.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC namespace BlockRotationHelpers. - * - */ -namespace BlockRotationHelpers { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA - /** - * @symbol ?fromVec3\@BlockRotationHelpers\@\@YAXAEAUBlockRotationDescription\@\@AEBVVec3\@\@\@Z - */ - MCAPI void fromVec3(struct BlockRotationDescription &, class Vec3 const &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockSelectionBoxDescription.hpp b/LiteLoader/include/llapi/mc/BlockSelectionBoxDescription.hpp index 22c631bfeb..82fbc8da65 100644 --- a/LiteLoader/include/llapi/mc/BlockSelectionBoxDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockSelectionBoxDescription.hpp @@ -41,24 +41,43 @@ struct BlockSelectionBoxDescription { virtual void initializeComponent(class EntityContext &) const; /** * @vftbl 3 - * @symbol __unk_vfn_3 + * @symbol ?initializeComponentFromCode\@BlockSelectionBoxDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ - virtual void __unk_vfn_3(); + virtual void initializeComponentFromCode(class EntityContext &) const; /** * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); + /** + * @vftbl 5 * @symbol ?isNetworkComponent\@BlockSelectionBoxDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 + * @vftbl 6 * @symbol ?buildNetworkTag\@BlockSelectionBoxDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?initializeFromNetwork\@BlockSelectionBoxDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKSELECTIONBOXDESCRIPTION + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BlockSelectionBoxDescription(); +#endif + /** + * @symbol ??0BlockSelectionBoxDescription\@\@QEAA\@_N\@Z + */ + MCAPI BlockSelectionBoxDescription(bool); + /** + * @symbol ??0BlockSelectionBoxDescription\@\@QEAA\@AEBVVec3\@\@0\@Z + */ + MCAPI BlockSelectionBoxDescription(class Vec3 const &, class Vec3 const &); /** * @symbol ?NameID\@BlockSelectionBoxDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ diff --git a/LiteLoader/include/llapi/mc/BlockSelectionBoxUtil.hpp b/LiteLoader/include/llapi/mc/BlockSelectionBoxUtil.hpp new file mode 100644 index 0000000000..2167050d82 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockSelectionBoxUtil.hpp @@ -0,0 +1,24 @@ +/** + * @file BlockSelectionBoxUtil.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace BlockSelectionBoxUtil { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?computeAABBFromOriginAndSize\@BlockSelectionBoxUtil\@\@YA?AVAABB\@\@AEBVVec3\@\@0\@Z + */ + MCAPI class AABB computeAABBFromOriginAndSize(class Vec3 const &, class Vec3 const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockSource.hpp b/LiteLoader/include/llapi/mc/BlockSource.hpp index bf9e6bd93b..e440bde7a8 100644 --- a/LiteLoader/include/llapi/mc/BlockSource.hpp +++ b/LiteLoader/include/llapi/mc/BlockSource.hpp @@ -194,9 +194,9 @@ struct ClipParameters virtual class gsl::span, -1> fetchEntities(class Actor const *, class AABB const &, bool, bool); /** * @vftbl 26 - * @symbol ?fetchEntities\@BlockSource\@\@UEAA?AV?$span\@V?$not_null\@PEAVActor\@\@\@gsl\@\@$0?0\@gsl\@\@W4ActorType\@\@AEBVAABB\@\@PEBVActor\@\@\@Z + * @symbol ?fetchEntities\@BlockSource\@\@UEAA?AV?$span\@V?$not_null\@PEAVActor\@\@\@gsl\@\@$0?0\@gsl\@\@W4ActorType\@\@AEBVAABB\@\@PEBVActor\@\@V?$function\@$$A6A_NPEAVActor\@\@\@Z\@std\@\@\@Z */ - virtual class gsl::span, -1> fetchEntities(enum class ActorType, class AABB const &, class Actor const *); + virtual class gsl::span, -1> fetchEntities(enum class ActorType, class AABB const &, class Actor const *, class std::function); /** * @vftbl 27 * @symbol ?setBlock\@BlockSource\@\@UEAA_NAEBVBlockPos\@\@AEBVBlock\@\@HPEBUActorBlockSyncMessage\@\@PEAVActor\@\@\@Z @@ -285,14 +285,14 @@ struct ClipParameters */ MCVAPI ~BlockSource(); #endif - /** - * @symbol ??0BlockSource\@\@QEAA\@AEAVChunkSource\@\@_N1\@Z - */ - MCAPI BlockSource(class ChunkSource &, bool, bool); /** * @symbol ??0BlockSource\@\@QEAA\@AEAVLevel\@\@AEAVDimension\@\@AEAVChunkSource\@\@_N33\@Z */ MCAPI BlockSource(class Level &, class Dimension &, class ChunkSource &, bool, bool, bool); + /** + * @symbol ??0BlockSource\@\@QEAA\@AEAVChunkSource\@\@_N1\@Z + */ + MCAPI BlockSource(class ChunkSource &, bool, bool); /** * @symbol ?_fetchEntities\@BlockSource\@\@QEAA?AV?$span\@V?$not_null\@PEAVActor\@\@\@gsl\@\@$0?0\@gsl\@\@PEBUIActorMovementProxy\@\@AEBVAABB\@\@_N\@Z */ @@ -353,14 +353,14 @@ struct ClipParameters * @symbol ?checkValidity\@BlockSource\@\@QEBAXXZ */ MCAPI void checkValidity() 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 ?clip\@BlockSource\@\@QEBA?AVHitResult\@\@AEBUClipParameters\@\@\@Z + */ + MCAPI class HitResult clip(struct ClipParameters const &) const; /** * @symbol ?containsAnyBlockInBox\@BlockSource\@\@QEAA_NAEBVBoundingBox\@\@V?$function\@$$A6A_NAEBVBlock\@\@\@Z\@std\@\@\@Z */ @@ -469,14 +469,14 @@ struct ClipParameters * @symbol ?getAABBFetchResultCache\@BlockSource\@\@QEAAAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector & getAABBFetchResultCache(); - /** - * @symbol ?getAboveTopSolidBlock\@BlockSource\@\@QEAAFAEBVBlockPos\@\@_N1\@Z - */ - MCAPI short getAboveTopSolidBlock(class BlockPos const &, bool, bool); /** * @symbol ?getAboveTopSolidBlock\@BlockSource\@\@QEAAFHH_N0\@Z */ MCAPI short getAboveTopSolidBlock(int, int, bool, bool); + /** + * @symbol ?getAboveTopSolidBlock\@BlockSource\@\@QEAAFAEBVBlockPos\@\@_N1\@Z + */ + MCAPI short getAboveTopSolidBlock(class BlockPos const &, bool, bool); /** * @symbol ?getAllocatedHeightAt\@BlockSource\@\@QEAAFAEBVBlockPos\@\@\@Z */ @@ -529,14 +529,14 @@ struct ClipParameters * @symbol ?getHeightmapPos\@BlockSource\@\@QEBA?AVBlockPos\@\@AEBV2\@\@Z */ 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 ?getLevel\@BlockSource\@\@QEBAAEAVLevel\@\@XZ + */ + MCAPI class Level & getLevel() const; /** * @symbol ?getLevelConst\@BlockSource\@\@QEBAAEBVLevel\@\@XZ */ @@ -581,22 +581,30 @@ 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 ?hasTickInCurrentTick\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@W4TickingQueueType\@\@\@Z + * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlock\@\@W4TickingQueueType\@\@\@Z */ - MCAPI bool hasTickInCurrentTick(class BlockPos const &, enum class TickingQueueType) const; + MCAPI bool hasTickInPendingTicks(class BlockPos const &, class Block 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 */ MCAPI bool hasTickInPendingTicks(class BlockPos const &, class BlockLegacy const &, enum class TickingQueueType) const; /** - * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlock\@\@W4TickingQueueType\@\@\@Z + * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlockLegacy\@\@\@Z */ - MCAPI bool hasTickInPendingTicks(class BlockPos const &, class Block const &, enum class TickingQueueType) const; + MCAPI bool hasTickInPendingTicks(class BlockPos const &, class BlockLegacy const &) const; /** * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ @@ -605,14 +613,6 @@ struct ClipParameters * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@\@Z */ MCAPI bool hasTickInPendingTicks(class BlockPos const &) const; - /** - * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@W4TickingQueueType\@\@\@Z - */ - MCAPI bool hasTickInPendingTicks(class BlockPos const &, enum class TickingQueueType) const; - /** - * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlockLegacy\@\@\@Z - */ - MCAPI bool hasTickInPendingTicks(class BlockPos const &, class BlockLegacy const &) const; /** * @symbol ?hasUntickedNeighborChunk\@BlockSource\@\@QEBA_NAEBVChunkPos\@\@H\@Z */ @@ -625,14 +625,14 @@ struct ClipParameters * @symbol ?isConsideredSolidBlock\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@\@Z */ MCAPI bool isConsideredSolidBlock(class BlockPos const &); - /** - * @symbol ?isEmptyBlock\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@\@Z - */ - MCAPI bool isEmptyBlock(class BlockPos const &) const; /** * @symbol ?isEmptyBlock\@BlockSource\@\@QEAA_NHHH\@Z */ MCAPI bool isEmptyBlock(int, int, int); + /** + * @symbol ?isEmptyBlock\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@\@Z + */ + MCAPI bool isEmptyBlock(class BlockPos const &) const; /** * @symbol ?isEmptyWaterBlock\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@\@Z */ @@ -685,14 +685,14 @@ struct ClipParameters * @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_NHHH\@Z - */ - MCAPI bool removeBlock(int, int, int); /** * @symbol ?removeBlock\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@\@Z */ MCAPI bool removeBlock(class BlockPos const &); + /** + * @symbol ?removeBlock\@BlockSource\@\@QEAA_NHHH\@Z + */ + MCAPI bool removeBlock(int, int, int); /** * @symbol ?removeBlockEntity\@BlockSource\@\@QEAA?AV?$shared_ptr\@VBlockActor\@\@\@std\@\@AEBVBlockPos\@\@\@Z */ @@ -705,14 +705,14 @@ struct ClipParameters * @symbol ?removeFromTickingQueue\@BlockSource\@\@QEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ MCAPI void removeFromTickingQueue(class BlockPos const &, class Block const &); - /** - * @symbol ?setBlock\@BlockSource\@\@QEAA_NHHHAEBVBlock\@\@HPEAVActor\@\@\@Z - */ - MCAPI bool setBlock(int, int, int, class Block const &, int, class Actor *); /** * @symbol ?setBlock\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@AEBVBlock\@\@HV?$shared_ptr\@VBlockActor\@\@\@std\@\@PEBUActorBlockSyncMessage\@\@PEAVActor\@\@\@Z */ MCAPI bool setBlock(class BlockPos const &, class Block const &, int, class std::shared_ptr, struct ActorBlockSyncMessage const *, class Actor *); + /** + * @symbol ?setBlock\@BlockSource\@\@QEAA_NHHHAEBVBlock\@\@HPEAVActor\@\@\@Z + */ + MCAPI bool setBlock(int, int, int, class Block const &, int, class Actor *); /** * @symbol ?setBlockNoUpdate\@BlockSource\@\@QEAA_NHHHAEBVBlock\@\@\@Z */ @@ -786,9 +786,9 @@ struct ClipParameters */ MCAPI static bool containsMaterial(class IConstBlockSource const &, class AABB const &, enum class MaterialType); /** - * @symbol ?doesIntersect\@BlockSource\@\@SA_NAEBVIConstBlockSource\@\@AEBVAABB\@\@AEBVGetCollisionShapeInterface\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @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 &); + MCAPI static bool doesIntersect(class IConstBlockSource const &, class AABB const &, class GetCollisionShapeInterface const &, std::vector &, bool); /** * @symbol ?getLiquidBlock\@BlockSource\@\@SAAEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockState.hpp b/LiteLoader/include/llapi/mc/BlockState.hpp index ad4687b53f..0c5272beca 100644 --- a/LiteLoader/include/llapi/mc/BlockState.hpp +++ b/LiteLoader/include/llapi/mc/BlockState.hpp @@ -34,5 +34,9 @@ class BlockState { * @symbol ?forEachState\@BlockState\@\@SAXV?$function\@$$A6A_NAEBVBlockState\@\@\@Z\@std\@\@\@Z */ MCAPI static void forEachState(class std::function); + /** + * @symbol ?getState\@BlockState\@\@SAPEBV1\@AEBVHashedString\@\@\@Z + */ + MCAPI static class BlockState const * getState(class HashedString const &); }; diff --git a/LiteLoader/include/llapi/mc/BlockStateGroup.hpp b/LiteLoader/include/llapi/mc/BlockStateGroup.hpp index 20c932307b..3db0e0298f 100644 --- a/LiteLoader/include/llapi/mc/BlockStateGroup.hpp +++ b/LiteLoader/include/llapi/mc/BlockStateGroup.hpp @@ -45,6 +45,10 @@ class BlockStateGroup { * @symbol ?registerBlockStateDefinition\@BlockStateGroup\@\@QEAAXAEBUBlockStateDefinition\@\@\@Z */ MCAPI void registerBlockStateDefinition(struct BlockStateDefinition const &); + /** + * @symbol ?registerExistingBlockState\@BlockStateGroup\@\@QEAAXAEBVBlockState\@\@\@Z + */ + MCAPI void registerExistingBlockState(class BlockState const &); /** * @symbol ?registerToBlock\@BlockStateGroup\@\@QEAAXAEAVBlockLegacy\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockStateMeta.hpp b/LiteLoader/include/llapi/mc/BlockStateMeta.hpp index d9a4546182..9fb120ccf9 100644 --- a/LiteLoader/include/llapi/mc/BlockStateMeta.hpp +++ b/LiteLoader/include/llapi/mc/BlockStateMeta.hpp @@ -30,6 +30,10 @@ class BlockStateMeta { #endif public: + /** + * @symbol ??0BlockStateMeta\@\@QEAA\@AEBVBlockState\@\@AEBUBlockStateDefinition\@\@\@Z + */ + MCAPI BlockStateMeta(class BlockState const &, struct BlockStateDefinition const &); /** * @symbol ?getBool\@BlockStateMeta\@\@QEBA?B_NH\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockStateRegistry.hpp b/LiteLoader/include/llapi/mc/BlockStateRegistry.hpp index 448e492c37..e230a2e5bb 100644 --- a/LiteLoader/include/llapi/mc/BlockStateRegistry.hpp +++ b/LiteLoader/include/llapi/mc/BlockStateRegistry.hpp @@ -24,6 +24,14 @@ class BlockStateRegistry { #endif public: + /** + * @symbol ?registerBlockState\@BlockStateRegistry\@\@QEAAXAEBVBlockState\@\@\@Z + */ + MCAPI void registerBlockState(class BlockState const &); + /** + * @symbol ?unregisterBlockStates\@BlockStateRegistry\@\@QEAAXXZ + */ + MCAPI void unregisterBlockStates(); /** * @symbol ?get\@BlockStateRegistry\@\@SAAEAV1\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BlockTraitConversionUtils.hpp b/LiteLoader/include/llapi/mc/BlockTraitConversionUtils.hpp new file mode 100644 index 0000000000..1b1505e99b --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockTraitConversionUtils.hpp @@ -0,0 +1,28 @@ +/** + * @file BlockTraitConversionUtils.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace BlockTraitConversionUtils { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?cardinalDirectionStateGetter\@BlockTraitConversionUtils\@\@3V?$function\@$$A6A?AV?$optional\@H\@std\@\@AEBVBlockLegacy\@\@H\@Z\@std\@\@A + */ + MCAPI extern class std::function (class BlockLegacy const &, int)> cardinalDirectionStateGetter; + /** + * @symbol ?cardinalDirectionStateSetter\@BlockTraitConversionUtils\@\@3V?$function\@$$A6APEBVBlock\@\@AEBVBlockLegacy\@\@HH\@Z\@std\@\@A + */ + MCAPI extern class std::function cardinalDirectionStateSetter; + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockTraitFactory.hpp b/LiteLoader/include/llapi/mc/BlockTraitFactory.hpp new file mode 100644 index 0000000000..ffced2e702 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockTraitFactory.hpp @@ -0,0 +1,44 @@ +/** + * @file BlockTraitFactory.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class BlockTraitFactory { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKTRAITFACTORY +public: + class BlockTraitFactory& operator=(class BlockTraitFactory const &) = delete; + BlockTraitFactory(class BlockTraitFactory const &) = delete; + BlockTraitFactory() = delete; +#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 + */ + MCAPI ~BlockTraitFactory(); + /** + * @symbol ?mRegisteredTraits\@BlockTraitFactory\@\@2V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UConstructor\@BlockTraitFactory\@\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UConstructor\@BlockTraitFactory\@\@\@std\@\@\@2\@\@std\@\@A + */ + MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> mRegisteredTraits; + /** + * @symbol ?registerAllTraits\@BlockTraitFactory\@\@SAXXZ + */ + MCAPI static void registerAllTraits(); + +}; diff --git a/LiteLoader/include/llapi/mc/BlockTransformationComponent.hpp b/LiteLoader/include/llapi/mc/BlockTransformationComponent.hpp index 25beb45a2f..12910f78f5 100644 --- a/LiteLoader/include/llapi/mc/BlockTransformationComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockTransformationComponent.hpp @@ -24,17 +24,21 @@ class BlockTransformationComponent { #endif public: - /** - * @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 ??0BlockTransformationComponent\@\@QEAA\@AEBVVec3\@\@AEBURotationType\@0\@0\@Z + */ + MCAPI BlockTransformationComponent(class Vec3 const &, struct BlockTransformationComponent::RotationType const &, class Vec3 const &); /** * @symbol ?getTransformationMatrix\@BlockTransformationComponent\@\@QEBAAEBVMatrix\@\@XZ */ MCAPI class Matrix const & getTransformationMatrix() const; + /** + * @symbol ?setRotation\@BlockTransformationComponent\@\@QEAAXAEBURotationType\@1\@\@Z + */ + MCAPI void setRotation(struct BlockTransformationComponent::RotationType const &); }; diff --git a/LiteLoader/include/llapi/mc/BlockTransformationDescription.hpp b/LiteLoader/include/llapi/mc/BlockTransformationDescription.hpp index d1854d891d..37b7519c3d 100644 --- a/LiteLoader/include/llapi/mc/BlockTransformationDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockTransformationDescription.hpp @@ -45,16 +45,21 @@ struct BlockTransformationDescription { virtual void __unk_vfn_3(); /** * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); + /** + * @vftbl 5 * @symbol ?isNetworkComponent\@BlockTransformationDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 + * @vftbl 6 * @symbol ?buildNetworkTag\@BlockTransformationDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?initializeFromNetwork\@BlockTransformationDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); @@ -70,5 +75,9 @@ struct BlockTransformationDescription { * @symbol ?bindType\@BlockTransformationDescription\@\@SAXXZ */ MCAPI static void bindType(); + /** + * @symbol ?registerVersionUpgrades\@BlockTransformationDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z + */ + MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockUnitCubeDescription.hpp b/LiteLoader/include/llapi/mc/BlockUnitCubeDescription.hpp index f9861404ca..3f822c7fbe 100644 --- a/LiteLoader/include/llapi/mc/BlockUnitCubeDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockUnitCubeDescription.hpp @@ -48,11 +48,16 @@ struct BlockUnitCubeDescription { virtual void initializeFromNetwork(class CompoundTag const &); /** * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); + /** + * @vftbl 5 * @symbol ?isNetworkComponent\@BlockUnitCubeDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 + * @vftbl 6 * @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 da33aff420..32a3c5bbec 100644 --- a/LiteLoader/include/llapi/mc/BlockUnwalkableDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockUnwalkableDescription.hpp @@ -47,21 +47,26 @@ class BlockUnwalkableDescription { virtual void initializeComponent(class EntityContext &) const; /** * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 * @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 4 + * @vftbl 5 * @symbol ?isNetworkComponent\@BlockUnwalkableDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 + * @vftbl 6 * @symbol ?buildNetworkTag\@BlockUnwalkableDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 7 * @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 d05e337608..c16aeb2be4 100644 --- a/LiteLoader/include/llapi/mc/BlueIceBlock.hpp +++ b/LiteLoader/include/llapi/mc/BlueIceBlock.hpp @@ -40,16 +40,21 @@ class BlueIceBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class BlueIceBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class BlueIceBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,107 +131,102 @@ class BlueIceBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 190 + * @vftbl 189 * @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 41a99db511..caa6a25166 100644 --- a/LiteLoader/include/llapi/mc/Boat.hpp +++ b/LiteLoader/include/llapi/mc/Boat.hpp @@ -51,167 +51,162 @@ class Boat : public Actor { */ virtual void remove(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@Boat\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 56 + * @vftbl 55 * @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 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 79 + * @vftbl 77 * @symbol ?getShadowHeightOffs\@Boat\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 80 + * @vftbl 78 * @symbol ?getShadowRadius\@Boat\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** * @vftbl 88 - * @symbol __unk_vfn_88 - */ - virtual void __unk_vfn_88(); - /** - * @vftbl 90 * @symbol ?onAboveBubbleColumn\@Boat\@\@UEAAX_N\@Z */ virtual void onAboveBubbleColumn(bool); /** - * @vftbl 95 + * @vftbl 93 * @symbol ?isPickable\@Boat\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_94(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_97(); + /** + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 134 + * @vftbl 132 * @symbol ?isInvulnerableTo\@Boat\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?getControllingPlayer\@Boat\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getControllingPlayer() const; /** - * @vftbl 188 + * @vftbl 186 * @symbol ?canAddPassenger\@Boat\@\@UEBA_NAEAVActor\@\@\@Z */ virtual bool canAddPassenger(class Actor &) const; /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 221 + * @vftbl 219 * @symbol ?getPassengerYRotation\@Boat\@\@UEBAMAEBVActor\@\@\@Z */ virtual float getPassengerYRotation(class Actor const &) const; /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@Boat\@\@EEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 276 + * @vftbl 268 * @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 f67bd732f8..4edf7d8f3d 100644 --- a/LiteLoader/include/llapi/mc/BoatItem.hpp +++ b/LiteLoader/include/llapi/mc/BoatItem.hpp @@ -36,11 +36,6 @@ class BoatItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class BoatItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 46 * @symbol ?isStackedByData\@BoatItem\@\@UEBA_NXZ @@ -127,17 +127,27 @@ class BoatItem : public Item { */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 118 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 120 * @symbol ?getIconInfo\@BoatItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 132 + * @vftbl 134 * @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 133 + * @vftbl 135 * @symbol ?_getActorType\@BoatItem\@\@EEBA?AW4ActorType\@\@XZ */ virtual enum class ActorType _getActorType() const; diff --git a/LiteLoader/include/llapi/mc/BoatPaddleInputSystem.hpp b/LiteLoader/include/llapi/mc/BoatPaddleInputSystem.hpp index 0d1f154789..3c687ec2e2 100644 --- a/LiteLoader/include/llapi/mc/BoatPaddleInputSystem.hpp +++ b/LiteLoader/include/llapi/mc/BoatPaddleInputSystem.hpp @@ -20,5 +20,9 @@ namespace BoatPaddleInputSystem { * @symbol ?createSystem\@BoatPaddleInputSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ MCAPI struct TickingSystemWithInfo createSystem(); + /** + * @symbol ?doBoatPaddleInputSystem\@BoatPaddleInputSystem\@\@YAXAEBVStrictEntityContext\@\@AEBUMoveInputComponent\@\@AEBUPlayerInputModeComponent\@\@AEBUPassengerComponent\@\@AEAUPlayerPaddleComponent\@\@AEBV?$optional_ref\@$$CBUPlayerInteractionModelComponent\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@$$CBUActorRotationComponent\@\@UBoatPaddleComponent\@\@USynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UControlledByLocalInstanceFlag\@\@\@\@\@\@\@\@AEBUCurrentTickComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UPlayerHandsBusyFlag\@\@\@\@\@\@\@Z + */ + MCAPI void doBoatPaddleInputSystem(class StrictEntityContext const &, struct MoveInputComponent const &, struct PlayerInputModeComponent const &, struct PassengerComponent const &, struct PlayerPaddleComponent &, class optional_ref const &, class ViewT const>> const &, struct CurrentTickComponent const &, class EntityModifierT>); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BookCloningRecipe.hpp b/LiteLoader/include/llapi/mc/BookCloningRecipe.hpp index f40b76e0cf..e09a2d08cc 100644 --- a/LiteLoader/include/llapi/mc/BookCloningRecipe.hpp +++ b/LiteLoader/include/llapi/mc/BookCloningRecipe.hpp @@ -37,9 +37,9 @@ class BookCloningRecipe : public Recipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@BookCloningRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z + * @symbol ?assemble\@BookCloningRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEAVCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; + virtual std::vector const & assemble(class CraftingContainer &, class CraftingContext &) const; /** * @vftbl 2 * @symbol ?getCraftingSize\@BookCloningRecipe\@\@UEBAHXZ @@ -62,9 +62,9 @@ class BookCloningRecipe : public Recipe { virtual void __unk_vfn_5(); /** * @vftbl 6 - * @symbol ?matches\@BookCloningRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @symbol ?matches\@BookCloningRecipe\@\@UEBA_NAEBVCraftingContainer\@\@AEBVCraftingContext\@\@\@Z */ - virtual bool matches(class CraftingContainer &, class Level &) const; + virtual bool matches(class CraftingContainer const &, class CraftingContext const &) const; /** * @vftbl 7 * @symbol ?size\@BookCloningRecipe\@\@UEBAHXZ diff --git a/LiteLoader/include/llapi/mc/BookEditPacket.hpp b/LiteLoader/include/llapi/mc/BookEditPacket.hpp index ca7e96a062..74bedfcff4 100644 --- a/LiteLoader/include/llapi/mc/BookEditPacket.hpp +++ b/LiteLoader/include/llapi/mc/BookEditPacket.hpp @@ -50,9 +50,9 @@ class BookEditPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@BookEditPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@BookEditPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BOOKEDITPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/BookshelfBlock.hpp b/LiteLoader/include/llapi/mc/BookshelfBlock.hpp index e6e47c44e6..677e76e5e2 100644 --- a/LiteLoader/include/llapi/mc/BookshelfBlock.hpp +++ b/LiteLoader/include/llapi/mc/BookshelfBlock.hpp @@ -40,16 +40,21 @@ class BookshelfBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class BookshelfBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class BookshelfBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,117 +131,112 @@ class BookshelfBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@BookshelfBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@BookshelfBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@BookshelfBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/BoostableComponent.hpp b/LiteLoader/include/llapi/mc/BoostableComponent.hpp index 93e37e44b8..9a235fb012 100644 --- a/LiteLoader/include/llapi/mc/BoostableComponent.hpp +++ b/LiteLoader/include/llapi/mc/BoostableComponent.hpp @@ -25,13 +25,14 @@ class BoostableComponent { public: class BoostableComponent& operator=(class BoostableComponent const &) = delete; BoostableComponent(class BoostableComponent const &) = delete; + BoostableComponent() = delete; #endif public: /** - * @symbol ??0BoostableComponent\@\@QEAA\@XZ + * @symbol ?boost\@BoostableComponent\@\@QEAAXAEAVActor\@\@\@Z */ - MCAPI BoostableComponent(); + MCAPI void boost(class Actor &); /** * @symbol ?getBoostTime\@BoostableComponent\@\@QEBAHXZ */ @@ -61,17 +62,13 @@ class BoostableComponent { */ MCAPI void setIsBoosting(bool); /** - * @symbol ?getSpeedModifierBoosting\@BoostableComponent\@\@SA?AV?$shared_ptr\@VAttributeModifier\@\@\@std\@\@XZ + * @symbol ?getSpeedModifierUUID\@BoostableComponent\@\@SA?AVUUID\@mce\@\@XZ */ - MCAPI static class std::shared_ptr getSpeedModifierBoosting(); + MCAPI static class mce::UUID getSpeedModifierUUID(); //private: private: - /** - * @symbol ?SPEED_MODIFIER_BOOSTING\@BoostableComponent\@\@0V?$shared_ptr\@VAttributeModifier\@\@\@std\@\@A - */ - MCAPI static class std::shared_ptr SPEED_MODIFIER_BOOSTING; /** * @symbol ?SPEED_MODIFIER_BOOSTING_UUID\@BoostableComponent\@\@0VUUID\@mce\@\@B */ diff --git a/LiteLoader/include/llapi/mc/BorderBlock.hpp b/LiteLoader/include/llapi/mc/BorderBlock.hpp index 83f3c50e8b..e0aa5b4779 100644 --- a/LiteLoader/include/llapi/mc/BorderBlock.hpp +++ b/LiteLoader/include/llapi/mc/BorderBlock.hpp @@ -45,16 +45,21 @@ class BorderBlock : public WallBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class BorderBlock : public WallBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class BorderBlock : public WallBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,147 +136,142 @@ class BorderBlock : public WallBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 - */ - virtual void __unk_vfn_75(); - /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@BorderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @symbol ?buildDescriptionId\@BorderBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 143 + * @vftbl 141 * @symbol ?getVisualShapeInWorld\@BorderBlock\@\@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 144 + * @vftbl 142 * @symbol ?getVisualShape\@BorderBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@BorderBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@BorderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@BorderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@BorderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @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 0815a6cf2c..cc9fbf8c3d 100644 --- a/LiteLoader/include/llapi/mc/BossEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/BossEventPacket.hpp @@ -51,23 +51,23 @@ class BossEventPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@BossEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@BossEventPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BOSSEVENTPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~BossEventPacket(); #endif - /** - * @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\@W4BossEventUpdateType\@\@UActorUniqueID\@\@AEAVBossComponent\@\@\@Z + */ + MCAPI BossEventPacket(enum class BossEventUpdateType, struct ActorUniqueID, class BossComponent &); /** * @symbol ??0BossEventPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BottleItem.hpp b/LiteLoader/include/llapi/mc/BottleItem.hpp index a112f779d2..9c957a7a92 100644 --- a/LiteLoader/include/llapi/mc/BottleItem.hpp +++ b/LiteLoader/include/llapi/mc/BottleItem.hpp @@ -36,11 +36,6 @@ class BottleItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class BottleItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -112,7 +112,17 @@ class BottleItem : public Item { */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 132 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 134 * @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/BowItem.hpp b/LiteLoader/include/llapi/mc/BowItem.hpp index 64a378e2b8..f87a24f7b8 100644 --- a/LiteLoader/include/llapi/mc/BowItem.hpp +++ b/LiteLoader/include/llapi/mc/BowItem.hpp @@ -36,11 +36,6 @@ class BowItem : public RangedWeaponItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class BowItem : public RangedWeaponItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -112,12 +112,22 @@ class BowItem : public RangedWeaponItem { */ virtual void enchantProjectile(class ItemStackBase const &, class Actor &) const; /** - * @vftbl 117 + * @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\@BowItem\@\@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 118 + * @vftbl 120 * @symbol ?getIconInfo\@BowItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; diff --git a/LiteLoader/include/llapi/mc/BreedableComponent.hpp b/LiteLoader/include/llapi/mc/BreedableComponent.hpp index 57d84e0b6d..98bee1ae63 100644 --- a/LiteLoader/include/llapi/mc/BreedableComponent.hpp +++ b/LiteLoader/include/llapi/mc/BreedableComponent.hpp @@ -98,6 +98,10 @@ class BreedableComponent { * @symbol ?_canBreed\@BreedableComponent\@\@AEAA_NAEAVActor\@\@AEAVPlayer\@\@AEBVItemStack\@\@\@Z */ MCAPI bool _canBreed(class Actor &, class Player &, class ItemStack const &); + /** + * @symbol ?_determineBreedType\@BreedableComponent\@\@AEBA?AV?$optional\@UBreedableType\@\@\@std\@\@AEBVActor\@\@\@Z + */ + MCAPI class std::optional _determineBreedType(class Actor const &) const; /** * @symbol ?_handleMate\@BreedableComponent\@\@AEAAPEAVActor\@\@AEAV2\@0\@Z */ @@ -110,6 +114,14 @@ class BreedableComponent { * @symbol ?_meetsEnvironmentRequirements\@BreedableComponent\@\@AEBA_NAEAVActor\@\@\@Z */ MCAPI bool _meetsEnvironmentRequirements(class Actor &) const; + /** + * @symbol ?_spawnExperienceOrbs\@BreedableComponent\@\@AEAAXAEAVActor\@\@\@Z + */ + MCAPI void _spawnExperienceOrbs(class Actor &); + /** + * @symbol ?_spawnLoveParticles\@BreedableComponent\@\@AEAAXAEAVActor\@\@\@Z + */ + MCAPI void _spawnLoveParticles(class Actor &); /** * @symbol ?_useBreedItem\@BreedableComponent\@\@AEAAXAEAVActor\@\@AEAVPlayer\@\@AEBVItemStack\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BrewingStandBlock.hpp b/LiteLoader/include/llapi/mc/BrewingStandBlock.hpp index 97196acfec..e0cfe206a8 100644 --- a/LiteLoader/include/llapi/mc/BrewingStandBlock.hpp +++ b/LiteLoader/include/llapi/mc/BrewingStandBlock.hpp @@ -60,16 +60,21 @@ class BrewingStandBlock : public ActorBlock { * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -81,10 +86,10 @@ class BrewingStandBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -116,10 +121,10 @@ class BrewingStandBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -146,142 +151,137 @@ class BrewingStandBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 69 + * @vftbl 68 * @symbol ?checkIsPathable\@BrewingStandBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@BrewingStandBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 - */ - virtual void __unk_vfn_126(); - /** - * @vftbl 127 + * @vftbl 125 * @symbol ?getComparatorSignal\@BrewingStandBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 134 + * @vftbl 132 * @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 152 + * @vftbl 150 * @symbol ?animateTick\@BrewingStandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@BrewingStandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@BrewingStandBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @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 40ac7f2758..3223d73195 100644 --- a/LiteLoader/include/llapi/mc/BrushItem.hpp +++ b/LiteLoader/include/llapi/mc/BrushItem.hpp @@ -31,11 +31,6 @@ class BrushItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -51,6 +46,11 @@ class BrushItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -61,6 +61,11 @@ class BrushItem : public Item { * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); + /** + * @vftbl 62 + * @symbol ?getEnchantSlot\@BrushItem\@\@UEBAHXZ + */ + virtual int getEnchantSlot() const; /** * @vftbl 66 * @symbol __unk_vfn_66 @@ -97,9 +102,48 @@ class BrushItem : public Item { */ virtual void __unk_vfn_80(); /** - * @vftbl 132 + * @vftbl 89 + * @symbol ?hurtActor\@BrushItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z + */ + virtual void hurtActor(class ItemStack &, class Actor &, class Mob &) const; + /** + * @vftbl 92 + * @symbol ?mineBlock\@BrushItem\@\@UEBA_NAEAVItemInstance\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z + */ + virtual bool mineBlock(class ItemInstance &, class Block const &, int, int, int, class Actor *) const; + /** + * @vftbl 93 + * @symbol ?mineBlock\@BrushItem\@\@UEBA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z + */ + virtual bool mineBlock(class ItemStack &, class Block const &, int, int, int, class Actor *) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 134 * @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; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BRUSHITEM + /** + * @symbol ?useInterruptedByAttacking\@BrushItem\@\@UEBA_NXZ + */ + 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 6c526fce63..5241f56926 100644 --- a/LiteLoader/include/llapi/mc/BrushableBlock.hpp +++ b/LiteLoader/include/llapi/mc/BrushableBlock.hpp @@ -5,14 +5,14 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "HeavyBlock.hpp" +#include "FallingBlock.hpp" #define BEFORE_EXTRA #undef BEFORE_EXTRA -class BrushableBlock : public HeavyBlock { +class BrushableBlock : public FallingBlock { #define AFTER_EXTRA @@ -35,16 +35,21 @@ class BrushableBlock : public HeavyBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -56,10 +61,10 @@ class BrushableBlock : public HeavyBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -91,10 +96,10 @@ class BrushableBlock : public HeavyBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -121,167 +126,162 @@ class BrushableBlock : public HeavyBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@BrushableBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 86 * @symbol ?mayConsumeFertilizer\@BrushableBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@BrushableBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@BrushableBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@BrushableBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 153 + * @vftbl 151 * @symbol ?init\@BrushableBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@BrushableBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@BrushableBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@BrushableBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 195 + * @vftbl 194 * @symbol ?getDustColor\@BrushableBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 196 + * @vftbl 195 * @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 197 - * @symbol __unk_vfn_197 + * @vftbl 196 + * @symbol __unk_vfn_196 */ - virtual void __unk_vfn_197(); + virtual void __unk_vfn_196(); /** - * @vftbl 198 + * @vftbl 197 * @symbol ?onLand\@BrushableBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onLand(class BlockSource &, class BlockPos const &) const; diff --git a/LiteLoader/include/llapi/mc/BrushableBlockActor.hpp b/LiteLoader/include/llapi/mc/BrushableBlockActor.hpp index cc600cdc41..9434fccb87 100644 --- a/LiteLoader/include/llapi/mc/BrushableBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BrushableBlockActor.hpp @@ -79,9 +79,9 @@ class BrushableBlockActor { */ MCAPI BrushableBlockActor(class HashedString const &, class BlockPos const &, enum class BrushableBlockActor::Placement); /** - * @symbol ?brush\@BrushableBlockActor\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @symbol ?brush\@BrushableBlockActor\@\@QEAA?AW4BrushingState\@1\@AEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ - MCAPI void brush(class BlockSource &, class BlockPos const &, unsigned char); + MCAPI enum class BrushableBlockActor::BrushingState brush(class BlockSource &, class BlockPos const &, unsigned char); /** * @symbol ?update\@BrushableBlockActor\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BubbleColumnBlock.hpp b/LiteLoader/include/llapi/mc/BubbleColumnBlock.hpp index cf0b1e959d..d06a8a4bd7 100644 --- a/LiteLoader/include/llapi/mc/BubbleColumnBlock.hpp +++ b/LiteLoader/include/llapi/mc/BubbleColumnBlock.hpp @@ -60,16 +60,21 @@ class BubbleColumnBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -81,10 +86,10 @@ class BubbleColumnBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -116,10 +121,10 @@ class BubbleColumnBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -146,15 +151,15 @@ class BubbleColumnBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -162,151 +167,146 @@ class BubbleColumnBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@BubbleColumnBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 63 + * @vftbl 62 * @symbol ?getRequiredMedium\@BubbleColumnBlock\@\@UEBA?AV?$optional\@VHashedString\@\@\@std\@\@XZ */ virtual class std::optional getRequiredMedium() const; /** - * @vftbl 69 + * @vftbl 68 * @symbol ?checkIsPathable\@BubbleColumnBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 84 + * @vftbl 83 * @symbol ?isPreservingMediumWhenPlaced\@BubbleColumnBlock\@\@UEBA_NPEBVBlockLegacy\@\@\@Z */ virtual bool isPreservingMediumWhenPlaced(class BlockLegacy const *) const; /** - * @vftbl 90 + * @vftbl 89 * @symbol ?mayPick\@BubbleColumnBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z */ virtual bool mayPick(class BlockSource const &, class Block const &, bool) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@BubbleColumnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 113 + * @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 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 141 + * @vftbl 139 * @symbol ?onGraphicsModeChanged\@BubbleColumnBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@BubbleColumnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@BubbleColumnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@BubbleColumnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@BubbleColumnBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 190 + * @vftbl 189 * @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 1c599f499b..3c659a1a84 100644 --- a/LiteLoader/include/llapi/mc/BucketItem.hpp +++ b/LiteLoader/include/llapi/mc/BucketItem.hpp @@ -36,11 +36,6 @@ class BucketItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class BucketItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -157,22 +157,32 @@ class BucketItem : public Item { */ virtual bool validFishInteraction(int) const; /** - * @vftbl 117 + * @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\@BucketItem\@\@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 122 + * @vftbl 124 * @symbol ?getLightEmission\@BucketItem\@\@UEBA?AUBrightness\@\@H\@Z */ virtual struct Brightness getLightEmission(int) const; /** - * @vftbl 129 + * @vftbl 131 * @symbol ?getAuxValuesDescription\@BucketItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getAuxValuesDescription() const; /** - * @vftbl 132 + * @vftbl 134 * @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 d1272dd623..7e73a5e91d 100644 --- a/LiteLoader/include/llapi/mc/BuddingAmethystBlock.hpp +++ b/LiteLoader/include/llapi/mc/BuddingAmethystBlock.hpp @@ -40,16 +40,21 @@ class BuddingAmethystBlock : public AmethystBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class BuddingAmethystBlock : public AmethystBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class BuddingAmethystBlock : public AmethystBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,115 +131,110 @@ class BuddingAmethystBlock : public AmethystBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@BuddingAmethystBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_169(); /** * @vftbl 171 - * @symbol __unk_vfn_171 - */ - virtual void __unk_vfn_171(); - /** - * @vftbl 173 * @symbol ?randomTick\@BuddingAmethystBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BUDDINGAMETHYSTBLOCK /** * @symbol ?canBeSilkTouched\@BuddingAmethystBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/BuiltInBlockStates.hpp b/LiteLoader/include/llapi/mc/BuiltInBlockStates.hpp index 64b8ca3362..42fbeea5fe 100644 --- a/LiteLoader/include/llapi/mc/BuiltInBlockStates.hpp +++ b/LiteLoader/include/llapi/mc/BuiltInBlockStates.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Direction.hpp" #define BEFORE_EXTRA @@ -16,6 +17,22 @@ namespace BuiltInBlockStates { #define AFTER_EXTRA #undef AFTER_EXTRA + /** + * @symbol ?BlockFace\@BuiltInBlockStates\@\@3V?$BuiltInBlockStateVariant\@E\@\@B + */ + MCAPI extern class BuiltInBlockStateVariant const BlockFace; + /** + * @symbol ?CardinalDirection\@BuiltInBlockStates\@\@3V?$BuiltInBlockStateVariant\@W4Type\@Direction\@\@\@\@B + */ + MCAPI extern class BuiltInBlockStateVariant const CardinalDirection; + /** + * @symbol ?FacingDirection\@BuiltInBlockStates\@\@3V?$BuiltInBlockStateVariant\@E\@\@B + */ + MCAPI extern class BuiltInBlockStateVariant const FacingDirection; + /** + * @symbol ?VerticalHalf\@BuiltInBlockStates\@\@3V?$BuiltInBlockStateVariant\@W4VerticalHalfEnum\@\@\@\@B + */ + MCAPI extern class BuiltInBlockStateVariant const VerticalHalf; /** * @symbol ?getNumStates\@BuiltInBlockStates\@\@YA_KXZ */ diff --git a/LiteLoader/include/llapi/mc/BushBlock.hpp b/LiteLoader/include/llapi/mc/BushBlock.hpp index 93285b486f..59dbadb6cc 100644 --- a/LiteLoader/include/llapi/mc/BushBlock.hpp +++ b/LiteLoader/include/llapi/mc/BushBlock.hpp @@ -45,16 +45,21 @@ class BushBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class BushBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class BushBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,130 +136,130 @@ class BushBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 93 + * @vftbl 92 * @symbol ?mayPlaceOn\@BushBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@BushBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_169(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 - */ - virtual void __unk_vfn_171(); - /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@BushBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@BushBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 195 + * @vftbl 194 * @symbol ?checkAlive\@BushBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void checkAlive(class BlockSource &, class BlockPos const &) const; + /** + * @vftbl 195 + * @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; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BUSHBLOCK /** * @symbol ?waterSpreadCausesSpawn\@BushBlock\@\@UEBA_NXZ @@ -273,5 +278,13 @@ class BushBlock : public BlockLegacy { * @symbol ?growCrops\@BushBlock\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@W4FertilizerType\@\@\@Z */ MCAPI bool growCrops(class BlockSource &, class BlockPos const &, enum class FertilizerType) const; + /** + * @symbol ?BUSH_VISUAL_SHAPE_MAX\@BushBlock\@\@2VVec3\@\@B + */ + MCAPI static class Vec3 const BUSH_VISUAL_SHAPE_MAX; + /** + * @symbol ?BUSH_VISUAL_SHAPE_MIN\@BushBlock\@\@2VVec3\@\@B + */ + MCAPI static class Vec3 const BUSH_VISUAL_SHAPE_MIN; }; diff --git a/LiteLoader/include/llapi/mc/ButtonBlock.hpp b/LiteLoader/include/llapi/mc/ButtonBlock.hpp index 905d69f51c..49cb5f6c36 100644 --- a/LiteLoader/include/llapi/mc/ButtonBlock.hpp +++ b/LiteLoader/include/llapi/mc/ButtonBlock.hpp @@ -45,16 +45,21 @@ class ButtonBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class ButtonBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class ButtonBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,200 +136,195 @@ class ButtonBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 51 + * @vftbl 50 * @symbol ?isSignalSource\@ButtonBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_53(); + /** + * @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 64 + * @vftbl 63 * @symbol ?shouldConnectToRedstone\@ButtonBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 69 + * @vftbl 68 * @symbol ?checkIsPathable\@ButtonBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 73 + * @vftbl 72 * @symbol ?onRedstoneUpdate\@ButtonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@ButtonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 91 + * @vftbl 90 * @symbol ?mayPlace\@ButtonBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@ButtonBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@ButtonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 108 + * @vftbl 107 * @symbol ?isAttachedTo\@ButtonBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool isAttachedTo(class BlockSource &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 113 + * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@ButtonBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getUIShape\@ButtonBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ virtual class AABB const & getUIShape(class Block const &, class AABB &) const; /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@ButtonBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 148 + * @vftbl 146 * @symbol ?canSpawnOn\@ButtonBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@ButtonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@ButtonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@ButtonBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@ButtonBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #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 ed6249bc83..fe5440460d 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 ?write\@ByteArrayTag\@\@UEBAXAEAVIDataOutput\@\@\@Z + * @symbol __unk_vfn_2 */ - virtual void write(class IDataOutput &) const; + virtual void __unk_vfn_2(); /** * @vftbl 3 * @symbol ?load\@ByteArrayTag\@\@UEAAXAEAVIDataInput\@\@\@Z @@ -80,6 +80,12 @@ 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 41e05bcb6c..c9677b8cf8 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 ?write\@ByteTag\@\@UEBAXAEAVIDataOutput\@\@\@Z + * @symbol __unk_vfn_2 */ - virtual void write(class IDataOutput &) const; + virtual void __unk_vfn_2(); /** * @vftbl 3 * @symbol ?load\@ByteTag\@\@UEAAXAEAVIDataInput\@\@\@Z @@ -79,6 +79,10 @@ 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/CachedHeightGenerator.hpp b/LiteLoader/include/llapi/mc/CachedHeightGenerator.hpp new file mode 100644 index 0000000000..cdec97db04 --- /dev/null +++ b/LiteLoader/include/llapi/mc/CachedHeightGenerator.hpp @@ -0,0 +1,24 @@ +/** + * @file CachedHeightGenerator.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace CachedHeightGenerator { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?cachedGenerationOfTerrainHeight\@CachedHeightGenerator\@\@YAFAEBVBlockPos\@\@AEAVDimension\@\@AEAVBlockVolume\@\@AEAV?$unordered_map\@VChunkPos\@\@V?$unique_ptr\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@U?$default_delete\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@\@2\@\@std\@\@U?$hash\@VChunkPos\@\@\@3\@U?$equal_to\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$unique_ptr\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@U?$default_delete\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z + */ + MCAPI short cachedGenerationOfTerrainHeight(class BlockPos const &, class Dimension &, class BlockVolume &, class std::unordered_map>, struct std::hash, struct std::equal_to, class std::allocator>>>> &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/CactusBlock.hpp b/LiteLoader/include/llapi/mc/CactusBlock.hpp index 1c8d358106..a1993e2dce 100644 --- a/LiteLoader/include/llapi/mc/CactusBlock.hpp +++ b/LiteLoader/include/llapi/mc/CactusBlock.hpp @@ -45,16 +45,21 @@ class CactusBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class CactusBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class CactusBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,150 +136,145 @@ class CactusBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** * @vftbl 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 55 * @symbol ?isValidAuxValue\@CactusBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; + /** + * @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 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@CactusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@CactusBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 113 + * @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 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 141 + * @vftbl 139 * @symbol ?onGraphicsModeChanged\@CactusBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 159 + * @vftbl 157 * @symbol ?dealsContactDamage\@CactusBlock\@\@UEBA_NAEBVActor\@\@AEBVBlock\@\@_N\@Z */ virtual bool dealsContactDamage(class Actor const &, class Block const &, bool) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@CactusBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 + * @vftbl 171 * @symbol ?randomTick\@CactusBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@CactusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #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 f0c15eb197..e3aa60ffdc 100644 --- a/LiteLoader/include/llapi/mc/CakeBlock.hpp +++ b/LiteLoader/include/llapi/mc/CakeBlock.hpp @@ -40,16 +40,21 @@ class CakeBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class CakeBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class CakeBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,155 +131,150 @@ class CakeBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 69 + * @vftbl 68 * @symbol ?checkIsPathable\@CakeBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 91 + * @vftbl 90 * @symbol ?mayPlace\@CakeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@CakeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@CakeBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 - */ - virtual void __unk_vfn_126(); - /** - * @vftbl 127 + * @vftbl 125 * @symbol ?getComparatorSignal\@CakeBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@CakeBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@CakeBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@CakeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@CakeBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@CakeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #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 d43ddf5124..d2f0cf7767 100644 --- a/LiteLoader/include/llapi/mc/CalibratedSculkSensorBlock.hpp +++ b/LiteLoader/include/llapi/mc/CalibratedSculkSensorBlock.hpp @@ -35,16 +35,21 @@ class CalibratedSculkSensorBlock : public SculkSensorBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -56,10 +61,10 @@ class CalibratedSculkSensorBlock : public SculkSensorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -91,10 +96,10 @@ class CalibratedSculkSensorBlock : public SculkSensorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -121,130 +126,125 @@ class CalibratedSculkSensorBlock : public SculkSensorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@CalibratedSculkSensorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@CalibratedSculkSensorBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?getMappedFace\@CalibratedSculkSensorBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 151 + * @vftbl 149 * @symbol ?getFaceFlip\@CalibratedSculkSensorBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z */ virtual enum class Flip getFaceFlip(unsigned char, class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 4e663985f2..aee2fecb03 100644 --- a/LiteLoader/include/llapi/mc/CalibratedSculkSensorBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/CalibratedSculkSensorBlockActor.hpp @@ -66,10 +66,10 @@ class CalibratedSculkSensorBlockActor : public SculkSensorBlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); /** * @symbol ??0CalibratedSculkSensorBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/Camel.hpp b/LiteLoader/include/llapi/mc/Camel.hpp index c08ceb2f00..41ca9ebf3a 100644 --- a/LiteLoader/include/llapi/mc/Camel.hpp +++ b/LiteLoader/include/llapi/mc/Camel.hpp @@ -35,150 +35,145 @@ class Camel : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 36 + * @vftbl 35 * @symbol ?getInterpolatedRidingOffset\@Camel\@\@UEBA?AVVec3\@\@MH\@Z */ virtual class Vec3 getInterpolatedRidingOffset(float, int) const; /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@Camel\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 - */ - virtual void __unk_vfn_178(); - /** - * @vftbl 182 + * @vftbl 180 * @symbol ?causeFallDamage\@Camel\@\@MEAAXMMVActorDamageSource\@\@\@Z */ virtual void causeFallDamage(float, float, class ActorDamageSource); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 266 + * @vftbl 258 * @symbol ?_playStepSound\@Camel\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 288 + * @vftbl 280 * @symbol ?aiStep\@Camel\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0Camel\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CameraBlock.hpp b/LiteLoader/include/llapi/mc/CameraBlock.hpp index 58a9b9cf9a..b9263eca95 100644 --- a/LiteLoader/include/llapi/mc/CameraBlock.hpp +++ b/LiteLoader/include/llapi/mc/CameraBlock.hpp @@ -40,16 +40,21 @@ class CameraBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class CameraBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class CameraBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,110 +131,105 @@ class CameraBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 66 + * @vftbl 65 * @symbol ?canBeUsedInCommands\@CameraBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 + */ + virtual void __unk_vfn_74(); + /** + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 new file mode 100644 index 0000000000..a5a6598fcb --- /dev/null +++ b/LiteLoader/include/llapi/mc/CameraCommand.hpp @@ -0,0 +1,119 @@ +/** + * @file CameraCommand.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Command.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class CameraCommand : public Command { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CAMERACOMMAND +public: + class CameraCommand& operator=(class CameraCommand const &) = delete; + CameraCommand(class CameraCommand const &) = delete; + CameraCommand() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 2 + * @symbol ?execute\@CameraCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + */ + virtual void execute(class CommandOrigin const &, class CommandOutput &) const; + /** + * @symbol ?prepareInstruction\@CameraCommand\@\@QEBA_NAEAUCameraInstruction\@\@AEBVCameraPresets\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + */ + MCAPI bool prepareInstruction(struct CameraInstruction &, class CameraPresets const &, class CommandOrigin const &, class CommandOutput &) const; + /** + * @symbol ?ENUM_OPTION_CLEAR\@CameraCommand\@\@2PEBDEB + */ + MCAPI static char const * ENUM_OPTION_CLEAR; + /** + * @symbol ?ENUM_OPTION_COLOR\@CameraCommand\@\@2PEBDEB + */ + MCAPI static char const * ENUM_OPTION_COLOR; + /** + * @symbol ?ENUM_OPTION_DEFAULT\@CameraCommand\@\@2PEBDEB + */ + MCAPI static char const * ENUM_OPTION_DEFAULT; + /** + * @symbol ?ENUM_OPTION_EASE\@CameraCommand\@\@2PEBDEB + */ + MCAPI static char const * ENUM_OPTION_EASE; + /** + * @symbol ?ENUM_OPTION_FADE\@CameraCommand\@\@2PEBDEB + */ + MCAPI static char const * ENUM_OPTION_FADE; + /** + * @symbol ?ENUM_OPTION_POS\@CameraCommand\@\@2PEBDEB + */ + MCAPI static char const * ENUM_OPTION_POS; + /** + * @symbol ?ENUM_OPTION_ROT\@CameraCommand\@\@2PEBDEB + */ + MCAPI static char const * ENUM_OPTION_ROT; + /** + * @symbol ?ENUM_OPTION_SET\@CameraCommand\@\@2PEBDEB + */ + MCAPI static char const * ENUM_OPTION_SET; + /** + * @symbol ?ENUM_OPTION_TIME\@CameraCommand\@\@2PEBDEB + */ + MCAPI static char const * ENUM_OPTION_TIME; + /** + * @symbol ?OPTION_CLEAR\@CameraCommand\@\@2PEBDEB + */ + MCAPI static char const * OPTION_CLEAR; + /** + * @symbol ?OPTION_COLOR\@CameraCommand\@\@2PEBDEB + */ + MCAPI static char const * OPTION_COLOR; + /** + * @symbol ?OPTION_DEFAULT\@CameraCommand\@\@2PEBDEB + */ + MCAPI static char const * OPTION_DEFAULT; + /** + * @symbol ?OPTION_EASE\@CameraCommand\@\@2PEBDEB + */ + MCAPI static char const * OPTION_EASE; + /** + * @symbol ?OPTION_FADE\@CameraCommand\@\@2PEBDEB + */ + MCAPI static char const * OPTION_FADE; + /** + * @symbol ?OPTION_POS\@CameraCommand\@\@2PEBDEB + */ + MCAPI static char const * OPTION_POS; + /** + * @symbol ?OPTION_ROT\@CameraCommand\@\@2PEBDEB + */ + MCAPI static char const * OPTION_ROT; + /** + * @symbol ?OPTION_SET\@CameraCommand\@\@2PEBDEB + */ + MCAPI static char const * OPTION_SET; + /** + * @symbol ?OPTION_TIME\@CameraCommand\@\@2PEBDEB + */ + MCAPI static char const * OPTION_TIME; + /** + * @symbol ?setup\@CameraCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + */ + MCAPI static void setup(class CommandRegistry &); + +}; diff --git a/LiteLoader/include/llapi/mc/CameraInstructionPacket.hpp b/LiteLoader/include/llapi/mc/CameraInstructionPacket.hpp index 82d639e283..73d0078a3c 100644 --- a/LiteLoader/include/llapi/mc/CameraInstructionPacket.hpp +++ b/LiteLoader/include/llapi/mc/CameraInstructionPacket.hpp @@ -46,17 +46,27 @@ class CameraInstructionPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 4 - * @symbol ?readExtended\@CameraInstructionPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@CameraInstructionPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult read(class ReadOnlyBinaryStream &); /** * @vftbl 7 - * @symbol ?_read\@CameraInstructionPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CameraInstructionPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 &); }; diff --git a/LiteLoader/include/llapi/mc/CameraItem.hpp b/LiteLoader/include/llapi/mc/CameraItem.hpp index 5ff90399fa..8da1fbc6fd 100644 --- a/LiteLoader/include/llapi/mc/CameraItem.hpp +++ b/LiteLoader/include/llapi/mc/CameraItem.hpp @@ -36,11 +36,6 @@ class CameraItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class CameraItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -101,5 +101,15 @@ class CameraItem : public Item { * @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(); }; diff --git a/LiteLoader/include/llapi/mc/CameraPacket.hpp b/LiteLoader/include/llapi/mc/CameraPacket.hpp index 1587cda225..8737451999 100644 --- a/LiteLoader/include/llapi/mc/CameraPacket.hpp +++ b/LiteLoader/include/llapi/mc/CameraPacket.hpp @@ -51,9 +51,9 @@ class CameraPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@CameraPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CameraPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CAMERAPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/CameraPresets.hpp b/LiteLoader/include/llapi/mc/CameraPresets.hpp index 3962d823b1..53faf7b09b 100644 --- a/LiteLoader/include/llapi/mc/CameraPresets.hpp +++ b/LiteLoader/include/llapi/mc/CameraPresets.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Core.hpp" #define BEFORE_EXTRA @@ -34,6 +35,18 @@ class CameraPresets { * @symbol ?buildCameraPresetList\@CameraPresets\@\@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 buildCameraPresetList() const; + /** + * @symbol ?getCameraPresetIndex\@CameraPresets\@\@QEBA?AV?$optional\@I\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + */ + MCAPI class std::optional getCameraPresetIndex(std::string const &) const; + /** + * @symbol ?isEmpty\@CameraPresets\@\@QEBA_NXZ + */ + MCAPI bool isEmpty() const; + /** + * @symbol ?loadPresets\@CameraPresets\@\@QEAAXAEAVResourcePackManager\@\@\@Z + */ + MCAPI void loadPresets(class ResourcePackManager &); /** * @symbol ??4CameraPresets\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ @@ -42,8 +55,28 @@ 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 + */ + MCAPI static bool isAllowedEaseTarget(std::string const &); //private: + /** + * @symbol ?_discardInvalidPresets\@CameraPresets\@\@AEAAXXZ + */ + MCAPI void _discardInvalidPresets(); + /** + * @symbol ?_parseAndLoadCameraList\@CameraPresets\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@0\@Z + */ + MCAPI void _parseAndLoadCameraList(std::string const &, class SemVersion const &, std::string const &); + /** + * @symbol ?_parseAndLoadCameraPreset\@CameraPresets\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@0\@Z + */ + MCAPI void _parseAndLoadCameraPreset(std::string const &, class SemVersion const &, std::string const &); + /** + * @symbol ?_loadJsonFiles\@CameraPresets\@\@CAXAEAVResourcePackManager\@\@AEBV?$PathBuffer\@V?$StackString\@D$0EAA\@\@Core\@\@\@Core\@\@V?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@0\@Z\@std\@\@\@Z + */ + MCAPI static void _loadJsonFiles(class ResourcePackManager &, class Core::PathBuffer> const &, class std::function); /** * @symbol ?_setupBindings\@CameraPresets\@\@CAXXZ */ diff --git a/LiteLoader/include/llapi/mc/CameraPresetsPacket.hpp b/LiteLoader/include/llapi/mc/CameraPresetsPacket.hpp index e776f60368..3d217914d1 100644 --- a/LiteLoader/include/llapi/mc/CameraPresetsPacket.hpp +++ b/LiteLoader/include/llapi/mc/CameraPresetsPacket.hpp @@ -46,17 +46,27 @@ class CameraPresetsPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 4 - * @symbol ?readExtended\@CameraPresetsPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@CameraPresetsPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult read(class ReadOnlyBinaryStream &); /** * @vftbl 7 - * @symbol ?_read\@CameraPresetsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CameraPresetsPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 &); }; diff --git a/LiteLoader/include/llapi/mc/CameraShakePacket.hpp b/LiteLoader/include/llapi/mc/CameraShakePacket.hpp index 9090fdb0ff..cfb8e891a9 100644 --- a/LiteLoader/include/llapi/mc/CameraShakePacket.hpp +++ b/LiteLoader/include/llapi/mc/CameraShakePacket.hpp @@ -51,9 +51,9 @@ class CameraShakePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@CameraShakePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CameraShakePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CAMERASHAKEPACKET /** * @symbol __unk_destructor_-1 @@ -64,13 +64,13 @@ class CameraShakePacket : public Packet { * @symbol ??0CameraShakePacket\@\@QEAA\@MMW4CameraShakeType\@\@\@Z */ MCAPI CameraShakePacket(float, float, enum class CameraShakeType); - /** - * @symbol ??0CameraShakePacket\@\@QEAA\@XZ - */ - MCAPI CameraShakePacket(); /** * @symbol ??0CameraShakePacket\@\@QEAA\@W4CameraShakeAction\@\@\@Z */ MCAPI CameraShakePacket(enum class CameraShakeAction); + /** + * @symbol ??0CameraShakePacket\@\@QEAA\@XZ + */ + MCAPI CameraShakePacket(); }; diff --git a/LiteLoader/include/llapi/mc/CampfireBlock.hpp b/LiteLoader/include/llapi/mc/CampfireBlock.hpp index 13575552db..4af12d4406 100644 --- a/LiteLoader/include/llapi/mc/CampfireBlock.hpp +++ b/LiteLoader/include/llapi/mc/CampfireBlock.hpp @@ -50,16 +50,21 @@ class CampfireBlock : public ActorBlock { * @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 + */ + virtual void __unk_vfn_28(); /** * @vftbl 29 * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -72,14 +77,14 @@ class CampfireBlock : public ActorBlock { virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol __unk_vfn_34 + * @symbol ?isWaterBlocking\@CampfireBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_34(); + virtual bool isWaterBlocking() const; /** * @vftbl 35 - * @symbol ?isWaterBlocking\@CampfireBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_35 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -111,10 +116,10 @@ class CampfireBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -141,15 +146,15 @@ class CampfireBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -157,171 +162,166 @@ class CampfireBlock : public ActorBlock { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@CampfireBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 69 + * @vftbl 68 * @symbol ?checkIsPathable\@CampfireBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@CampfireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@CampfireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@CampfireBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 113 + * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@CampfireBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 148 + * @vftbl 146 * @symbol ?canSpawnOn\@CampfireBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@CampfireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 154 + * @vftbl 152 * @symbol ?getLightEmission\@CampfireBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@CampfireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@CampfireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@CampfireBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@CampfireBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@CampfireBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@CampfireBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/CampfireBlockActor.hpp b/LiteLoader/include/llapi/mc/CampfireBlockActor.hpp index f67bea208c..9a1b20d74d 100644 --- a/LiteLoader/include/llapi/mc/CampfireBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/CampfireBlockActor.hpp @@ -96,17 +96,17 @@ class CampfireBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); /** - * @vftbl 37 + * @vftbl 39 * @symbol ?_getUpdatePacket\@CampfireBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 38 + * @vftbl 40 * @symbol ?_onUpdatePacket\@CampfireBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/CandleBlock.hpp b/LiteLoader/include/llapi/mc/CandleBlock.hpp index bfd37d91db..7ff76c0cd6 100644 --- a/LiteLoader/include/llapi/mc/CandleBlock.hpp +++ b/LiteLoader/include/llapi/mc/CandleBlock.hpp @@ -45,16 +45,21 @@ class CandleBlock : public AbstractCandleBlock { * @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 + */ + virtual void __unk_vfn_28(); /** * @vftbl 29 * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class CandleBlock : public AbstractCandleBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class CandleBlock : public AbstractCandleBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,142 +136,137 @@ class CandleBlock : public AbstractCandleBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@CandleBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@CandleBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@CandleBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@CandleBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@CandleBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 195 + * @vftbl 194 * @symbol ?_getNumCandles\@CandleBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int _getNumCandles(class Block const &) const; /** - * @vftbl 196 + * @vftbl 195 * @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 197 + * @vftbl 196 * @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 2249ed0798..fc571224a3 100644 --- a/LiteLoader/include/llapi/mc/CandleBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/CandleBlockItem.hpp @@ -36,11 +36,6 @@ class CandleBlockItem : public BlockItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class CandleBlockItem : public BlockItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 45 * @symbol ?getLevelDataForAuxValue\@CandleBlockItem\@\@UEBAHH\@Z @@ -107,7 +107,17 @@ class CandleBlockItem : public BlockItem { */ virtual void __unk_vfn_80(); /** - * @vftbl 132 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 134 * @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 4bc9614f9f..b93be5d78b 100644 --- a/LiteLoader/include/llapi/mc/CandleCakeBlock.hpp +++ b/LiteLoader/include/llapi/mc/CandleCakeBlock.hpp @@ -40,16 +40,21 @@ class CandleCakeBlock : public AbstractCandleBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class CandleCakeBlock : public AbstractCandleBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class CandleCakeBlock : public AbstractCandleBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,167 +131,162 @@ class CandleCakeBlock : public AbstractCandleBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 69 + * @vftbl 68 * @symbol ?checkIsPathable\@CandleCakeBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 91 + * @vftbl 90 * @symbol ?mayPlace\@CandleCakeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@CandleCakeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@CandleCakeBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 127 + * @vftbl 125 * @symbol ?getComparatorSignal\@CandleCakeBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@CandleCakeBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@CandleCakeBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@CandleCakeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 + * @vftbl 187 * @symbol ?playerDestroy\@CandleCakeBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@CandleCakeBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 195 + * @vftbl 194 * @symbol ?_getNumCandles\@CandleCakeBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int _getNumCandles(class Block const &) const; /** - * @vftbl 196 + * @vftbl 195 * @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 197 + * @vftbl 196 * @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 b91435b285..5a7e4e6033 100644 --- a/LiteLoader/include/llapi/mc/CarpetBlock.hpp +++ b/LiteLoader/include/llapi/mc/CarpetBlock.hpp @@ -45,16 +45,21 @@ class CarpetBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class CarpetBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class CarpetBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,150 +136,149 @@ class CarpetBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 69 + * @vftbl 68 * @symbol ?checkIsPathable\@CarpetBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@CarpetBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@CarpetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@CarpetBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@CarpetBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@CarpetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@CarpetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@CarpetBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CARPETBLOCK /** * @symbol ?waterSpreadCausesSpawn\@CarpetBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~CarpetBlock(); #endif /** * @symbol ??0CarpetBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/CarrotBlock.hpp b/LiteLoader/include/llapi/mc/CarrotBlock.hpp index 1b0d71ff46..0ba22f5a52 100644 --- a/LiteLoader/include/llapi/mc/CarrotBlock.hpp +++ b/LiteLoader/include/llapi/mc/CarrotBlock.hpp @@ -45,16 +45,21 @@ class CarrotBlock : public CropBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class CarrotBlock : public CropBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class CarrotBlock : public CropBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,130 +136,120 @@ class CarrotBlock : public CropBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@CarrotBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 181 + * @vftbl 179 * @symbol ?getRenderLayer\@CarrotBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 182 + * @vftbl 180 * @symbol ?getRenderLayer\@CarrotBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@CarrotBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; - /** - * @vftbl 195 - * @symbol __unk_vfn_195 - */ - virtual void __unk_vfn_195(); /** * @vftbl 196 * @symbol ?getBaseSeed\@CarrotBlock\@\@UEBA?BVItemInstance\@\@XZ diff --git a/LiteLoader/include/llapi/mc/CarrotOnAStickItem.hpp b/LiteLoader/include/llapi/mc/CarrotOnAStickItem.hpp index 6f7414fb18..0b09fcc7fa 100644 --- a/LiteLoader/include/llapi/mc/CarrotOnAStickItem.hpp +++ b/LiteLoader/include/llapi/mc/CarrotOnAStickItem.hpp @@ -36,11 +36,6 @@ class CarrotOnAStickItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class CarrotOnAStickItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 49 * @symbol ?isHandEquipped\@CarrotOnAStickItem\@\@UEBA_NXZ @@ -131,6 +131,16 @@ class CarrotOnAStickItem : public Item { * @symbol ?mineBlock\@CarrotOnAStickItem\@\@UEBA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z */ virtual bool mineBlock(class ItemStack &, class Block const &, int, int, int, class Actor *) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); /** * @symbol ??0CarrotOnAStickItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/CartographyTableBlock.hpp b/LiteLoader/include/llapi/mc/CartographyTableBlock.hpp index fb2175e7ec..bd1403a619 100644 --- a/LiteLoader/include/llapi/mc/CartographyTableBlock.hpp +++ b/LiteLoader/include/llapi/mc/CartographyTableBlock.hpp @@ -40,16 +40,21 @@ class CartographyTableBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class CartographyTableBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class CartographyTableBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,110 +131,105 @@ class CartographyTableBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@CartographyTableBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #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 c82be27f2c..56a0fae56f 100644 --- a/LiteLoader/include/llapi/mc/Cat.hpp +++ b/LiteLoader/include/llapi/mc/Cat.hpp @@ -37,150 +37,145 @@ class Cat : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 121 + * @vftbl 119 * @symbol ?onTame\@Cat\@\@UEAAXXZ */ virtual void onTame(); /** - * @vftbl 133 + * @vftbl 131 * @symbol ?getAmbientSound\@Cat\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getAmbientSound() const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 258 + * @vftbl 250 * @symbol ?updateEntitySpecificMolangVariables\@Cat\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); + /** + * @vftbl 252 + * @symbol __unk_vfn_252 + */ + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); - /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 288 + * @vftbl 280 * @symbol ?aiStep\@Cat\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 347 + * @vftbl 339 * @symbol ?_serverAiMobStep\@Cat\@\@UEAAXXZ */ virtual void _serverAiMobStep(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0Cat\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CauldronBlock.hpp b/LiteLoader/include/llapi/mc/CauldronBlock.hpp index 1787233c40..15c1a60a92 100644 --- a/LiteLoader/include/llapi/mc/CauldronBlock.hpp +++ b/LiteLoader/include/llapi/mc/CauldronBlock.hpp @@ -56,16 +56,21 @@ class CauldronBlock : public ActorBlock { * @symbol ?canProvideSupport\@CauldronBlock\@\@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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -77,10 +82,10 @@ class CauldronBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -112,10 +117,10 @@ class CauldronBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -142,15 +147,15 @@ class CauldronBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -158,156 +163,161 @@ class CauldronBlock : public ActorBlock { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@CauldronBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 65 + * @vftbl 64 * @symbol ?handlePrecipitation\@CauldronBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@MM\@Z */ virtual void handlePrecipitation(class BlockSource &, class BlockPos const &, float, float) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 96 + * @vftbl 95 * @symbol ?breaksFallingBlocks\@CauldronBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@CauldronBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@CauldronBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 110 + * @vftbl 109 * @symbol ?handleEntityInside\@CauldronBlock\@\@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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 - */ - virtual void __unk_vfn_126(); - /** - * @vftbl 127 + * @vftbl 125 * @symbol ?getComparatorSignal\@CauldronBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@CauldronBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 152 + * @symbol ?getLightEmission\@CauldronBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ - virtual void __unk_vfn_157(); + virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_155(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_164(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_165(); /** - * @vftbl 169 + * @vftbl 166 + * @symbol __unk_vfn_166 + */ + virtual void __unk_vfn_166(); + /** + * @vftbl 167 * @symbol ?onPlace\@CauldronBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@CauldronBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@CauldronBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 183 + * @vftbl 181 * @symbol ?getExtraRenderLayers\@CauldronBlock\@\@UEBAHXZ */ virtual int getExtraRenderLayers() const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 183 + * @symbol ?getLight\@CauldronBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z + */ + virtual struct Brightness getLight(class Block const &) const; + /** + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@CauldronBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@CauldronBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/CaveSpider.hpp b/LiteLoader/include/llapi/mc/CaveSpider.hpp index 066180da22..3c59f9ac33 100644 --- a/LiteLoader/include/llapi/mc/CaveSpider.hpp +++ b/LiteLoader/include/llapi/mc/CaveSpider.hpp @@ -37,137 +37,132 @@ class CaveSpider : public Spider { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 - */ - virtual void __unk_vfn_217(); - /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 219 + * @vftbl 217 * @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 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); + /** + * @vftbl 252 + * @symbol __unk_vfn_252 + */ + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); - /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** - * @vftbl 354 + * @vftbl 346 * @symbol ?getModelScale\@CaveSpider\@\@UEBAMXZ */ virtual float getModelScale() const; /** - * @vftbl 355 + * @vftbl 347 * @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 8e1ad3f24e..5d4d997410 100644 --- a/LiteLoader/include/llapi/mc/CaveVinesBlock.hpp +++ b/LiteLoader/include/llapi/mc/CaveVinesBlock.hpp @@ -50,16 +50,21 @@ class CaveVinesBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -71,10 +76,10 @@ class CaveVinesBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +111,10 @@ class CaveVinesBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,15 +141,15 @@ class CaveVinesBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -152,166 +157,161 @@ class CaveVinesBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@CaveVinesBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@CaveVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@CaveVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@CaveVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@CaveVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@CaveVinesBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 118 + * @vftbl 117 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@CaveVinesBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@CaveVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@CaveVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@CaveVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 + * @vftbl 171 * @symbol ?randomTick\@CaveVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@CaveVinesBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@CaveVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@CaveVinesBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@CaveVinesBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/CerealHelpers.hpp b/LiteLoader/include/llapi/mc/CerealHelpers.hpp index 0f06f9bdbc..8115487561 100644 --- a/LiteLoader/include/llapi/mc/CerealHelpers.hpp +++ b/LiteLoader/include/llapi/mc/CerealHelpers.hpp @@ -21,6 +21,10 @@ namespace CerealHelpers { // Add Member There #undef AFTER_EXTRA + /** + * @symbol ?bindBoundingBox\@CerealHelpers\@\@YAXXZ + */ + MCAPI void bindBoundingBox(); /** * @symbol ?bindBrightness\@CerealHelpers\@\@YAXXZ */ @@ -121,6 +125,10 @@ namespace CerealHelpers { * @symbol ?identifierStringFromString\@CerealHelpers\@\@YAXAEAUIdentifierString\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void identifierStringFromString(struct CerealHelpers::IdentifierString &, std::string const &); + /** + * @symbol ?initialize\@CerealHelpers\@\@YAXXZ + */ + MCAPI void initialize(); /** * @symbol ?vec2FromArray\@CerealHelpers\@\@YAXAEAVVec2\@\@V?$array\@M$01\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CerealItemComponentFactory.hpp b/LiteLoader/include/llapi/mc/CerealItemComponentFactory.hpp index d7f8ebb3ae..1444d8d052 100644 --- a/LiteLoader/include/llapi/mc/CerealItemComponentFactory.hpp +++ b/LiteLoader/include/llapi/mc/CerealItemComponentFactory.hpp @@ -51,12 +51,20 @@ struct Constructor { * @symbol ?getItemContext\@CerealItemComponentFactory\@\@SAPEAVComponentItem\@\@XZ */ MCAPI static class ComponentItem * getItemContext(); + /** + * @symbol ?getReleasedMinFormatVersionForAnyComponent\@CerealItemComponentFactory\@\@SA?AV?$optional\@VSemVersion\@\@\@std\@\@XZ + */ + MCAPI static class std::optional getReleasedMinFormatVersionForAnyComponent(); /** * @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 &); //private: + /** + * @symbol ?updateReleasedMinFormatVersionForAnyComponent\@CerealItemComponentFactory\@\@CAXVSemVersion\@\@\@Z + */ + MCAPI static void updateReleasedMinFormatVersionForAnyComponent(class SemVersion); private: /** @@ -67,5 +75,9 @@ struct Constructor { * @symbol ?mRegisteredComponents\@CerealItemComponentFactory\@\@0V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UConstructor\@CerealItemComponentFactory\@\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UConstructor\@CerealItemComponentFactory\@\@\@std\@\@\@2\@\@std\@\@A */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> mRegisteredComponents; + /** + * @symbol ?mReleasedMinFormatVersionForAnyComponent\@CerealItemComponentFactory\@\@0V?$optional\@VSemVersion\@\@\@std\@\@A + */ + MCAPI static class std::optional mReleasedMinFormatVersionForAnyComponent; }; diff --git a/LiteLoader/include/llapi/mc/Certificate.hpp b/LiteLoader/include/llapi/mc/Certificate.hpp index 63847948aa..f1029aafda 100644 --- a/LiteLoader/include/llapi/mc/Certificate.hpp +++ b/LiteLoader/include/llapi/mc/Certificate.hpp @@ -53,6 +53,10 @@ class Certificate { * @symbol ?getNotBeforeDate\@Certificate\@\@QEBA_JXZ */ MCAPI __int64 getNotBeforeDate() const; + /** + * @symbol ?isSelfSigned\@Certificate\@\@QEBA_NXZ + */ + MCAPI bool isSelfSigned() const; /** * @symbol ?isValid\@Certificate\@\@QEBA_NXZ */ @@ -62,9 +66,9 @@ class Certificate { */ MCAPI std::string toString() const; /** - * @symbol ?validate\@Certificate\@\@QEAA_N_J\@Z + * @symbol ?validate\@Certificate\@\@QEAA_N_J_N\@Z */ - MCAPI bool validate(__int64); + MCAPI bool validate(__int64, bool); /** * @symbol ??1Certificate\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ChainBlock.hpp b/LiteLoader/include/llapi/mc/ChainBlock.hpp index 1b30bc3a9f..2a5e835a61 100644 --- a/LiteLoader/include/llapi/mc/ChainBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChainBlock.hpp @@ -50,16 +50,21 @@ class ChainBlock : public RotatedPillarBlock { * @symbol ?canConnect\@ChainBlock\@\@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 __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -71,10 +76,10 @@ class ChainBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +111,10 @@ class ChainBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,15 +141,15 @@ class ChainBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -152,111 +157,106 @@ class ChainBlock : public RotatedPillarBlock { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@ChainBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@ChainBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@ChainBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@ChainBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @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 4326e78a1e..d0ca0b24d6 100644 --- a/LiteLoader/include/llapi/mc/ChalkboardBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ChalkboardBlockActor.hpp @@ -97,16 +97,26 @@ class ChalkboardBlockActor : public BlockActor { virtual void __unk_vfn_35(); /** * @vftbl 36 - * @symbol __unk_vfn_36 + * @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 void __unk_vfn_36(); + virtual std::vector getUgcStrings(class CompoundTag const &) const; /** * @vftbl 37 + * @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 + */ + virtual void __unk_vfn_38(); + /** + * @vftbl 39 * @symbol ?_getUpdatePacket\@ChalkboardBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 38 + * @vftbl 40 * @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 4f90013c00..a8ec2641de 100644 --- a/LiteLoader/include/llapi/mc/ChangeDimensionPacket.hpp +++ b/LiteLoader/include/llapi/mc/ChangeDimensionPacket.hpp @@ -60,9 +60,9 @@ class ChangeDimensionPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ChangeDimensionPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ChangeDimensionPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 aba7092467..0b6b636be6 100644 --- a/LiteLoader/include/llapi/mc/ChangeMobPropertyPacket.hpp +++ b/LiteLoader/include/llapi/mc/ChangeMobPropertyPacket.hpp @@ -56,9 +56,9 @@ class ChangeMobPropertyPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ChangeMobPropertyPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ChangeMobPropertyPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ChangeMobPropertyPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ChargeableItemComponent.hpp b/LiteLoader/include/llapi/mc/ChargeableItemComponent.hpp index a2ea459565..b589bdae41 100644 --- a/LiteLoader/include/llapi/mc/ChargeableItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/ChargeableItemComponent.hpp @@ -49,16 +49,11 @@ class ChargeableItemComponent { virtual void __unk_vfn_3(); /** * @vftbl 4 - * @symbol __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 * @symbol ?buildNetworkTag\@ChargeableItemComponent\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 5 * @symbol ?initializeFromNetwork\@ChargeableItemComponent\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/ChemicalHeatBlock.hpp b/LiteLoader/include/llapi/mc/ChemicalHeatBlock.hpp index 71b07870c0..dae249d614 100644 --- a/LiteLoader/include/llapi/mc/ChemicalHeatBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChemicalHeatBlock.hpp @@ -40,16 +40,21 @@ class ChemicalHeatBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class ChemicalHeatBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class ChemicalHeatBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,75 +131,80 @@ class ChemicalHeatBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 66 + * @vftbl 65 * @symbol ?canBeUsedInCommands\@ChemicalHeatBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -202,49 +212,39 @@ class ChemicalHeatBlock : public BlockLegacy { 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 ?onPlace\@ChemicalHeatBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@ChemicalHeatBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 183 + * @vftbl 181 * @symbol ?getExtraRenderLayers\@ChemicalHeatBlock\@\@UEBAHXZ */ virtual int getExtraRenderLayers() const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 73107f77c9..9ca2fea9fd 100644 --- a/LiteLoader/include/llapi/mc/ChemistryAuxDataBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/ChemistryAuxDataBlockItem.hpp @@ -36,11 +36,6 @@ class ChemistryAuxDataBlockItem : public AuxDataBlockItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class ChemistryAuxDataBlockItem : public AuxDataBlockItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -106,5 +106,15 @@ class ChemistryAuxDataBlockItem : public AuxDataBlockItem { * @symbol ?fixupCommon\@ChemistryAuxDataBlockItem\@\@UEBAXAEAVItemStackBase\@\@\@Z */ virtual void fixupCommon(class ItemStackBase &) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); }; diff --git a/LiteLoader/include/llapi/mc/ChemistryItem.hpp b/LiteLoader/include/llapi/mc/ChemistryItem.hpp index fca64ba0df..057261d010 100644 --- a/LiteLoader/include/llapi/mc/ChemistryItem.hpp +++ b/LiteLoader/include/llapi/mc/ChemistryItem.hpp @@ -36,11 +36,6 @@ class ChemistryItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class ChemistryItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -106,6 +106,16 @@ class ChemistryItem : public Item { * @symbol ?fixupCommon\@ChemistryItem\@\@UEBAXAEAVItemStackBase\@\@\@Z */ virtual void fixupCommon(class ItemStackBase &) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CHEMISTRYITEM /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ChemistryStickItem.hpp b/LiteLoader/include/llapi/mc/ChemistryStickItem.hpp index bceba002d0..a73dc90aab 100644 --- a/LiteLoader/include/llapi/mc/ChemistryStickItem.hpp +++ b/LiteLoader/include/llapi/mc/ChemistryStickItem.hpp @@ -36,11 +36,6 @@ class ChemistryStickItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class ChemistryStickItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 30 * @symbol ?setMaxDamage\@ChemistryStickItem\@\@UEAAAEAVItem\@\@H\@Z @@ -141,6 +141,16 @@ class ChemistryStickItem : public Item { * @symbol ?fixupCommon\@ChemistryStickItem\@\@UEBAXAEAVItemStackBase\@\@\@Z */ virtual void fixupCommon(class ItemStackBase &) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CHEMISTRYSTICKITEM /** * @symbol ?showsDurabilityInCreative\@ChemistryStickItem\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/ChemistryTableBlock.hpp b/LiteLoader/include/llapi/mc/ChemistryTableBlock.hpp index a2683d6fe8..2f255c7fdc 100644 --- a/LiteLoader/include/llapi/mc/ChemistryTableBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChemistryTableBlock.hpp @@ -40,16 +40,21 @@ class ChemistryTableBlock : public ActorBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -62,14 +67,14 @@ class ChemistryTableBlock : public ActorBlock { virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol __unk_vfn_34 + * @symbol ?isWaterBlocking\@ChemistryTableBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_34(); + virtual bool isWaterBlocking() const; /** * @vftbl 35 - * @symbol ?isWaterBlocking\@ChemistryTableBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_35 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class ChemistryTableBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,162 +136,157 @@ class ChemistryTableBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** * @vftbl 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 55 * @symbol ?isValidAuxValue\@ChemistryTableBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 58 + * @vftbl 57 * @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 + */ + 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 66 + * @vftbl 65 * @symbol ?canBeUsedInCommands\@ChemistryTableBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@ChemistryTableBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@ChemistryTableBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@ChemistryTableBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?getMappedFace\@ChemistryTableBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@ChemistryTableBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@ChemistryTableBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 195 + * @vftbl 194 * @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/CherryLeafBlock.hpp b/LiteLoader/include/llapi/mc/CherryLeavesBlock.hpp similarity index 51% rename from LiteLoader/include/llapi/mc/CherryLeafBlock.hpp rename to LiteLoader/include/llapi/mc/CherryLeavesBlock.hpp index 65fe921003..f8fae2e5db 100644 --- a/LiteLoader/include/llapi/mc/CherryLeafBlock.hpp +++ b/LiteLoader/include/llapi/mc/CherryLeavesBlock.hpp @@ -1,27 +1,27 @@ /** - * @file CherryLeafBlock.hpp + * @file CherryLeavesBlock.hpp * */ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "LeafBlock.hpp" +#include "LeavesBlock.hpp" #define BEFORE_EXTRA #undef BEFORE_EXTRA -class CherryLeafBlock : public LeafBlock { +class CherryLeavesBlock : public LeavesBlock { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CHERRYLEAFBLOCK +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CHERRYLEAVESBLOCK public: - class CherryLeafBlock& operator=(class CherryLeafBlock const &) = delete; - CherryLeafBlock(class CherryLeafBlock const &) = delete; - CherryLeafBlock() = delete; + class CherryLeavesBlock& operator=(class CherryLeavesBlock const &) = delete; + CherryLeavesBlock(class CherryLeavesBlock const &) = delete; + CherryLeavesBlock() = delete; #endif public: @@ -35,16 +35,21 @@ class CherryLeafBlock : public LeafBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -56,10 +61,10 @@ class CherryLeafBlock : public LeafBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -91,10 +96,10 @@ class CherryLeafBlock : public LeafBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -121,153 +126,148 @@ class CherryLeafBlock : public LeafBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 137 - * @symbol ?getColor\@CherryLeafBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 135 + * @symbol ?getColor\@CherryLeavesBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 140 - * @symbol ?isSeasonTinted\@CherryLeafBlock\@\@UEBA_NAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 138 + * @symbol ?isSeasonTinted\@CherryLeavesBlock\@\@UEBA_NAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isSeasonTinted(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 141 - * @symbol ?onGraphicsModeChanged\@CherryLeafBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z + * @vftbl 139 + * @symbol ?onGraphicsModeChanged\@CherryLeavesBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 147 - * @symbol ?getVariant\@CherryLeafBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 145 + * @symbol ?getVariant\@CherryLeavesBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 152 - * @symbol ?animateTick\@CherryLeafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 150 + * @symbol ?animateTick\@CherryLeavesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 182 - * @symbol ?getRenderLayer\@CherryLeafBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 180 + * @symbol ?getRenderLayer\@CherryLeavesBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol ?getMapColor\@CherryLeafBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 185 + * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 - * @symbol ?getResourceItem\@CherryLeafBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@CherryLeavesBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 - * @symbol ?getSilkTouchItemInstance\@CherryLeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@CherryLeavesBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0CherryLeafBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0CherryLeavesBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ - MCAPI CherryLeafBlock(std::string const &, int); + MCAPI CherryLeavesBlock(std::string const &, int); }; diff --git a/LiteLoader/include/llapi/mc/CherrySaplingBlock.hpp b/LiteLoader/include/llapi/mc/CherrySaplingBlock.hpp index 287db37593..2a8b8db537 100644 --- a/LiteLoader/include/llapi/mc/CherrySaplingBlock.hpp +++ b/LiteLoader/include/llapi/mc/CherrySaplingBlock.hpp @@ -35,16 +35,21 @@ class CherrySaplingBlock : public BushBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -56,10 +61,10 @@ class CherrySaplingBlock : public BushBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -91,10 +96,10 @@ class CherrySaplingBlock : public BushBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -121,15 +126,15 @@ class CherrySaplingBlock : public BushBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -137,124 +142,130 @@ class CherrySaplingBlock : public BushBlock { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@CherrySaplingBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@CherrySaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@CherrySaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@CherrySaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + 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 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_167(); - /** - * @vftbl 168 - * @symbol __unk_vfn_168 - */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_169(); /** * @vftbl 171 - * @symbol __unk_vfn_171 - */ - virtual void __unk_vfn_171(); - /** - * @vftbl 173 * @symbol ?randomTick\@CherrySaplingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 181 + * @vftbl 179 * @symbol ?getRenderLayer\@CherrySaplingBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 182 + * @vftbl 180 * @symbol ?getRenderLayer\@CherrySaplingBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@CherrySaplingBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + */ + virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CHERRYSAPLINGBLOCK + /** + * @symbol ?canBeSilkTouched\@CherrySaplingBlock\@\@UEBA_NXZ + */ + MCVAPI bool canBeSilkTouched() const; +#endif /** * @symbol ??0CherrySaplingBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/ChestBlock.hpp b/LiteLoader/include/llapi/mc/ChestBlock.hpp index f566b5d64e..ff59cd3d6d 100644 --- a/LiteLoader/include/llapi/mc/ChestBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChestBlock.hpp @@ -45,16 +45,21 @@ class ChestBlock : public ActorBlock { * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class ChestBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class ChestBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,175 +136,170 @@ class ChestBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 51 + * @vftbl 50 * @symbol ?isSignalSource\@ChestBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_53(); + /** + * @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 64 + * @vftbl 63 * @symbol ?shouldConnectToRedstone\@ChestBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 71 + * @vftbl 70 * @symbol ?dispense\@ChestBlock\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 74 + * @vftbl 73 * @symbol ?onMove\@ChestBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void onMove(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@ChestBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 96 + * @vftbl 95 * @symbol ?breaksFallingBlocks\@ChestBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 100 + * @vftbl 99 * @symbol ?getSecondPart\@ChestBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool getSecondPart(class BlockSource const &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 127 + * @vftbl 125 * @symbol ?getComparatorSignal\@ChestBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 150 + * @vftbl 148 * @symbol ?getMappedFace\@ChestBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 153 + * @vftbl 151 * @symbol ?init\@ChestBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@ChestBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@ChestBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@ChestBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #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 d1e4a71ffc..aa8096f008 100644 --- a/LiteLoader/include/llapi/mc/ChestBoat.hpp +++ b/LiteLoader/include/llapi/mc/ChestBoat.hpp @@ -35,122 +35,117 @@ class ChestBoat : public Boat { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 57 + * @vftbl 56 * @symbol ?getEntityLocNameString\@ChestBoat\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getEntityLocNameString() const; /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 - */ - virtual void __unk_vfn_243(); - /** - * @vftbl 244 + * @vftbl 236 * @symbol ?kill\@ChestBoat\@\@UEAAXXZ */ virtual void kill(); + /** + * @vftbl 252 + * @symbol __unk_vfn_252 + */ + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); - /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 276 + * @vftbl 268 * @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 2b6c6dfc60..6924bf24ff 100644 --- a/LiteLoader/include/llapi/mc/ChestBoatItem.hpp +++ b/LiteLoader/include/llapi/mc/ChestBoatItem.hpp @@ -34,11 +34,6 @@ class ChestBoatItem : public BoatItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -54,6 +49,11 @@ class ChestBoatItem : public BoatItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -105,7 +105,17 @@ class ChestBoatItem : public BoatItem { */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 133 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 135 * @symbol ?_getActorType\@ChestBoatItem\@\@EEBA?AW4ActorType\@\@XZ */ virtual enum class ActorType _getActorType() const; diff --git a/LiteLoader/include/llapi/mc/ChestContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/ChestContainerManagerModel.hpp index 6fbefd3a38..bb359ea224 100644 --- a/LiteLoader/include/llapi/mc/ChestContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/ChestContainerManagerModel.hpp @@ -45,13 +45,13 @@ class ChestContainerManagerModel : public LevelContainerManagerModel { * @symbol ?_postInit\@ChestContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ */ virtual class ContainerScreenContext _postInit(); - /** - * @symbol ??0ChestContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@UActorUniqueID\@\@\@Z - */ - MCAPI ChestContainerManagerModel(enum class ContainerID, class Player &, struct ActorUniqueID); /** * @symbol ??0ChestContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@W4BlockActorType\@\@\@Z */ MCAPI ChestContainerManagerModel(enum class ContainerID, class Player &, class BlockPos const &, enum class BlockActorType); + /** + * @symbol ??0ChestContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@UActorUniqueID\@\@\@Z + */ + MCAPI ChestContainerManagerModel(enum class ContainerID, class Player &, struct ActorUniqueID); }; diff --git a/LiteLoader/include/llapi/mc/Chicken.hpp b/LiteLoader/include/llapi/mc/Chicken.hpp index 92f3d9fcdc..c42f131428 100644 --- a/LiteLoader/include/llapi/mc/Chicken.hpp +++ b/LiteLoader/include/llapi/mc/Chicken.hpp @@ -37,135 +37,130 @@ class Chicken : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 - */ - virtual void __unk_vfn_243(); - /** - * @vftbl 258 + * @vftbl 250 * @symbol ?updateEntitySpecificMolangVariables\@Chicken\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 266 + * @vftbl 258 * @symbol ?_playStepSound\@Chicken\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0Chicken\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ChiseledBookshelfBlock.hpp b/LiteLoader/include/llapi/mc/ChiseledBookshelfBlock.hpp index 7a015e60f1..4582c8d98c 100644 --- a/LiteLoader/include/llapi/mc/ChiseledBookshelfBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChiseledBookshelfBlock.hpp @@ -38,16 +38,21 @@ class ChiseledBookshelfBlock : public ActorBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -59,10 +64,10 @@ class ChiseledBookshelfBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -94,10 +99,10 @@ class ChiseledBookshelfBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -124,137 +129,132 @@ class ChiseledBookshelfBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@ChiseledBookshelfBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 - */ - virtual void __unk_vfn_126(); - /** - * @vftbl 127 + * @vftbl 125 * @symbol ?getComparatorSignal\@ChiseledBookshelfBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@ChiseledBookshelfBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 177 + * @vftbl 175 * @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 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@ChiseledBookshelfBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@ChiseledBookshelfBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @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 aeb16ad501..d0d7ff9f1c 100644 --- a/LiteLoader/include/llapi/mc/ChorusFlowerBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChorusFlowerBlock.hpp @@ -45,16 +45,21 @@ class ChorusFlowerBlock : public BlockLegacy { * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -67,14 +72,14 @@ class ChorusFlowerBlock : public BlockLegacy { virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol __unk_vfn_34 + * @symbol ?isWaterBlocking\@ChorusFlowerBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_34(); + virtual bool isWaterBlocking() const; /** * @vftbl 35 - * @symbol ?isWaterBlocking\@ChorusFlowerBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_35 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +111,10 @@ class ChorusFlowerBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,15 +141,15 @@ class ChorusFlowerBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -152,131 +157,126 @@ class ChorusFlowerBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@ChorusFlowerBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@ChorusFlowerBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@ChorusFlowerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@ChorusFlowerBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@ChorusFlowerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 + * @vftbl 171 * @symbol ?randomTick\@ChorusFlowerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@ChorusFlowerBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 + * @vftbl 187 * @symbol ?playerDestroy\@ChorusFlowerBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 190 + * @vftbl 189 * @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 59b58339ed..c4aa531e6e 100644 --- a/LiteLoader/include/llapi/mc/ChorusPlantBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChorusPlantBlock.hpp @@ -50,16 +50,21 @@ class ChorusPlantBlock : public BlockLegacy { * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -72,14 +77,14 @@ class ChorusPlantBlock : public BlockLegacy { virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol __unk_vfn_34 + * @symbol ?isWaterBlocking\@ChorusPlantBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_34(); + virtual bool isWaterBlocking() const; /** * @vftbl 35 - * @symbol ?isWaterBlocking\@ChorusPlantBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_35 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -111,10 +116,10 @@ class ChorusPlantBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -141,15 +146,15 @@ class ChorusPlantBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -157,129 +162,129 @@ class ChorusPlantBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@ChorusPlantBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 69 + * @vftbl 68 * @symbol ?checkIsPathable\@ChorusPlantBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@ChorusPlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@ChorusPlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_169(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 - */ - virtual void __unk_vfn_171(); - /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@ChorusPlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@ChorusPlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@ChorusPlantBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @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 @@ -300,11 +305,6 @@ class ChorusPlantBlock : public BlockLegacy { * @symbol __unk_vfn_198 */ virtual void __unk_vfn_198(); - /** - * @vftbl 199 - * @symbol __unk_vfn_199 - */ - virtual void __unk_vfn_199(); /** * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ChunkGenerationManager.hpp b/LiteLoader/include/llapi/mc/ChunkGenerationManager.hpp new file mode 100644 index 0000000000..f50753d72a --- /dev/null +++ b/LiteLoader/include/llapi/mc/ChunkGenerationManager.hpp @@ -0,0 +1,51 @@ +/** + * @file ChunkGenerationManager.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ChunkGenerationManager { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CHUNKGENERATIONMANAGER +public: + class ChunkGenerationManager& operator=(class ChunkGenerationManager const &) = delete; + ChunkGenerationManager(class ChunkGenerationManager const &) = delete; +#endif + +public: + /** + * @symbol ??0ChunkGenerationManager\@\@QEAA\@XZ + */ + MCAPI ChunkGenerationManager(); + /** + * @symbol ?addServerChunksToPacket\@ChunkGenerationManager\@\@QEAAXAEBVNetworkIdentifier\@\@W4SubClientId\@\@AEAVNetworkChunkPublisherUpdatePacket\@\@\@Z + */ + MCAPI void addServerChunksToPacket(class NetworkIdentifier const &, enum class SubClientId, class NetworkChunkPublisherUpdatePacket &); + /** + * @symbol ?clearAllGenerationRequests\@ChunkGenerationManager\@\@QEAAXAEBVNetworkIdentifier\@\@W4SubClientId\@\@\@Z + */ + MCAPI void clearAllGenerationRequests(class NetworkIdentifier const &, enum class SubClientId); + /** + * @symbol ?hasPendingGenerationRequests\@ChunkGenerationManager\@\@QEBA_NAEBVNetworkIdentifier\@\@W4SubClientId\@\@\@Z + */ + MCAPI bool hasPendingGenerationRequests(class NetworkIdentifier const &, enum class SubClientId) const; + /** + * @symbol ?queueChunkGenerationRequest\@ChunkGenerationManager\@\@QEAAXAEBVNetworkIdentifier\@\@W4SubClientId\@\@AEBVChunkPos\@\@\@Z + */ + MCAPI void queueChunkGenerationRequest(class NetworkIdentifier const &, enum class SubClientId, class ChunkPos const &); + /** + * @symbol ??1ChunkGenerationManager\@\@QEAA\@XZ + */ + MCAPI ~ChunkGenerationManager(); + +}; diff --git a/LiteLoader/include/llapi/mc/ChunkMoveNeededSystem.hpp b/LiteLoader/include/llapi/mc/ChunkMoveNeededSystem.hpp deleted file mode 100644 index ad3ecb762d..0000000000 --- a/LiteLoader/include/llapi/mc/ChunkMoveNeededSystem.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file ChunkMoveNeededSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class ChunkMoveNeededSystem. - * - */ -class ChunkMoveNeededSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CHUNKMOVENEEDEDSYSTEM -public: - class ChunkMoveNeededSystem& operator=(class ChunkMoveNeededSystem const &) = delete; - ChunkMoveNeededSystem(class ChunkMoveNeededSystem const &) = delete; - ChunkMoveNeededSystem() = delete; -#endif - -public: - /** - * @symbol ?createChunkMoveNeededSystem\@ChunkMoveNeededSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createChunkMoveNeededSystem(); - -}; diff --git a/LiteLoader/include/llapi/mc/ChunkRadiusUpdatedPacket.hpp b/LiteLoader/include/llapi/mc/ChunkRadiusUpdatedPacket.hpp index 4fbd3078df..be39a31fd8 100644 --- a/LiteLoader/include/llapi/mc/ChunkRadiusUpdatedPacket.hpp +++ b/LiteLoader/include/llapi/mc/ChunkRadiusUpdatedPacket.hpp @@ -51,9 +51,9 @@ class ChunkRadiusUpdatedPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ChunkRadiusUpdatedPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ChunkRadiusUpdatedPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CHUNKRADIUSUPDATEDPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ChunkTickRangeManager.hpp b/LiteLoader/include/llapi/mc/ChunkTickRangeManager.hpp index 258165ee83..0cc0a1856f 100644 --- a/LiteLoader/include/llapi/mc/ChunkTickRangeManager.hpp +++ b/LiteLoader/include/llapi/mc/ChunkTickRangeManager.hpp @@ -32,14 +32,14 @@ class ChunkTickRangeManager { * @symbol ?getAdjustedChunkTickRange\@ChunkTickRangeManager\@\@QEAAIAEBVLevelSettings\@\@\@Z */ MCAPI unsigned int getAdjustedChunkTickRange(class LevelSettings const &); - /** - * @symbol ?isChunkInTickRange\@ChunkTickRangeManager\@\@QEBA_NAEBVLevelChunk\@\@V?$optional\@H\@std\@\@\@Z - */ - MCAPI bool isChunkInTickRange(class LevelChunk const &, class std::optional) const; /** * @symbol ?isChunkInTickRange\@ChunkTickRangeManager\@\@QEBA_NAEBVChunkPos\@\@AEBVDimension\@\@_NMHH\@Z */ MCAPI bool isChunkInTickRange(class ChunkPos const &, class Dimension const &, bool, float, int, int) const; + /** + * @symbol ?isChunkInTickRange\@ChunkTickRangeManager\@\@QEBA_NAEBVLevelChunk\@\@V?$optional\@H\@std\@\@\@Z + */ + MCAPI bool isChunkInTickRange(class LevelChunk const &, class std::optional) const; /** * @symbol ?setChunkTickRange\@ChunkTickRangeManager\@\@QEAAXI\@Z */ diff --git a/LiteLoader/include/llapi/mc/ChunkViewSource.hpp b/LiteLoader/include/llapi/mc/ChunkViewSource.hpp index 135ecc2bd0..2df35addf8 100644 --- a/LiteLoader/include/llapi/mc/ChunkViewSource.hpp +++ b/LiteLoader/include/llapi/mc/ChunkViewSource.hpp @@ -72,10 +72,6 @@ char filler[0x188]; */ MCVAPI ~ChunkViewSource(); #endif - /** - * @symbol ??0ChunkViewSource\@\@QEAA\@AEAVChunkSource\@\@AEAV?$LevelChunkGridAreaElement\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@\@\@AEBUBounds\@\@\@Z - */ - MCAPI ChunkViewSource(class ChunkSource &, class LevelChunkGridAreaElement> &, struct Bounds const &); /** * @symbol ??0ChunkViewSource\@\@QEAA\@AEBV0\@\@Z */ @@ -84,6 +80,10 @@ char filler[0x188]; * @symbol ??0ChunkViewSource\@\@QEAA\@AEAVChunkSource\@\@W4LoadMode\@1\@\@Z */ MCAPI ChunkViewSource(class ChunkSource &, enum class ChunkSource::LoadMode); + /** + * @symbol ??0ChunkViewSource\@\@QEAA\@AEAVChunkSource\@\@AEAV?$LevelChunkGridAreaElement\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@\@\@AEBUBounds\@\@\@Z + */ + MCAPI ChunkViewSource(class ChunkSource &, class LevelChunkGridAreaElement> &, struct Bounds const &); /** * @symbol ?clear\@ChunkViewSource\@\@QEAAXXZ */ @@ -100,10 +100,6 @@ char filler[0x188]; * @symbol ?getArea\@ChunkViewSource\@\@QEAAAEAV?$GridArea\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@XZ */ MCAPI class GridArea> & getArea(); - /** - * @symbol ?move\@ChunkViewSource\@\@QEAAXAEBUBounds\@\@_NW4ChunkSourceViewGenerateMode\@\@V?$function\@$$A6AXV?$buffer_span_mut\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@V?$buffer_span\@I\@\@\@Z\@std\@\@PEBM\@Z - */ - MCAPI void move(struct Bounds const &, bool, enum class ChunkSourceViewGenerateMode, class std::function>, class buffer_span)>, float const *); /** * @symbol ?move\@ChunkViewSource\@\@QEAAXAEBVBlockPos\@\@H_NW4ChunkSourceViewGenerateMode\@\@V?$function\@$$A6AXV?$buffer_span_mut\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@V?$buffer_span\@I\@\@\@Z\@std\@\@PEBM\@Z */ @@ -112,6 +108,10 @@ char filler[0x188]; * @symbol ?move\@ChunkViewSource\@\@QEAAXAEBVBlockPos\@\@0_NW4ChunkSourceViewGenerateMode\@\@V?$function\@$$A6AXV?$buffer_span_mut\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@V?$buffer_span\@I\@\@\@Z\@std\@\@PEBM\@Z */ MCAPI void move(class BlockPos const &, class BlockPos const &, bool, enum class ChunkSourceViewGenerateMode, class std::function>, class buffer_span)>, float const *); + /** + * @symbol ?move\@ChunkViewSource\@\@QEAAXAEBUBounds\@\@_NW4ChunkSourceViewGenerateMode\@\@V?$function\@$$A6AXV?$buffer_span_mut\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@V?$buffer_span\@I\@\@\@Z\@std\@\@PEBM\@Z + */ + MCAPI void move(struct Bounds const &, bool, enum class ChunkSourceViewGenerateMode, class std::function>, class buffer_span)>, float const *); /** * @symbol ?rebuildSpecificArea\@ChunkViewSource\@\@QEAAXAEBUBounds\@\@_NV?$function\@$$A6AXV?$buffer_span_mut\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@V?$buffer_span\@I\@\@\@Z\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CircuitSystem.hpp b/LiteLoader/include/llapi/mc/CircuitSystem.hpp index 59b5d47d2c..cd079c959e 100644 --- a/LiteLoader/include/llapi/mc/CircuitSystem.hpp +++ b/LiteLoader/include/llapi/mc/CircuitSystem.hpp @@ -63,10 +63,6 @@ class CircuitSystem { * @symbol ?evaluate\@CircuitSystem\@\@QEAAXPEAVBlockSource\@\@\@Z */ MCAPI void evaluate(class BlockSource *); - /** - * @symbol ?getDirection\@CircuitSystem\@\@QEAAEAEBVBlockPos\@\@\@Z - */ - MCAPI unsigned char getDirection(class BlockPos const &); /** * @symbol ?getStrength\@CircuitSystem\@\@QEAAHAEBVBlockPos\@\@\@Z */ @@ -79,6 +75,10 @@ class CircuitSystem { * @symbol ?isAvailableAt\@CircuitSystem\@\@QEAA_NAEBVBlockPos\@\@\@Z */ MCAPI bool isAvailableAt(class BlockPos const &); + /** + * @symbol ?isConnectionAllowed\@CircuitSystem\@\@QEAA_NAEAVBaseCircuitComponent\@\@AEBVBlockPos\@\@E_N\@Z + */ + MCAPI bool isConnectionAllowed(class BaseCircuitComponent &, class BlockPos const &, unsigned char, bool); /** * @symbol ?preSetupPoweredBlocks\@CircuitSystem\@\@QEAAXAEBVChunkPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ClayBlock.hpp b/LiteLoader/include/llapi/mc/ClayBlock.hpp index 03db5f9fe2..de0e845378 100644 --- a/LiteLoader/include/llapi/mc/ClayBlock.hpp +++ b/LiteLoader/include/llapi/mc/ClayBlock.hpp @@ -40,16 +40,21 @@ class ClayBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class ClayBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class ClayBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,132 +131,127 @@ class ClayBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 52 + * @vftbl 51 * @symbol ?canBeOriginalSurface\@ClayBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@ClayBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 86 * @symbol ?mayConsumeFertilizer\@ClayBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@ClayBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + 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 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_169(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_173(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_177(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_186(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 - */ - virtual void __unk_vfn_179(); - /** - * @vftbl 187 - * @symbol __unk_vfn_187 - */ - virtual void __unk_vfn_187(); - /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@ClayBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@ClayBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/ClientAutoStepSystem.hpp b/LiteLoader/include/llapi/mc/ClientAutoStepSystem.hpp index 8c38ee5dcb..0288fefb8f 100644 --- a/LiteLoader/include/llapi/mc/ClientAutoStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/ClientAutoStepSystem.hpp @@ -49,9 +49,9 @@ class ClientAutoStepSystem { 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\@\@UPlayerGameTypeComponent\@\@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\@ULocalConstBlockSourceFactoryComponent\@\@ULocalSpatialEntityFetcherFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @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<>> &); + 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 */ diff --git a/LiteLoader/include/llapi/mc/ClientCacheBlobStatusPacket.hpp b/LiteLoader/include/llapi/mc/ClientCacheBlobStatusPacket.hpp index 86f7533658..d54e0be0ef 100644 --- a/LiteLoader/include/llapi/mc/ClientCacheBlobStatusPacket.hpp +++ b/LiteLoader/include/llapi/mc/ClientCacheBlobStatusPacket.hpp @@ -52,8 +52,8 @@ class ClientCacheBlobStatusPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ClientCacheBlobStatusPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ClientCacheBlobStatusPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/ClientCacheMissResponsePacket.hpp b/LiteLoader/include/llapi/mc/ClientCacheMissResponsePacket.hpp index 346a1b7029..17703fee1d 100644 --- a/LiteLoader/include/llapi/mc/ClientCacheMissResponsePacket.hpp +++ b/LiteLoader/include/llapi/mc/ClientCacheMissResponsePacket.hpp @@ -52,9 +52,9 @@ class ClientCacheMissResponsePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ClientCacheMissResponsePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ClientCacheMissResponsePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 f3c045556a..3e914c3900 100644 --- a/LiteLoader/include/llapi/mc/ClientCacheStatusPacket.hpp +++ b/LiteLoader/include/llapi/mc/ClientCacheStatusPacket.hpp @@ -51,9 +51,9 @@ class ClientCacheStatusPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ClientCacheStatusPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ClientCacheStatusPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ClientCacheStatusPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ClientCheatAbilityPacket.hpp b/LiteLoader/include/llapi/mc/ClientCheatAbilityPacket.hpp index 3225f2456f..09ef73cfa2 100644 --- a/LiteLoader/include/llapi/mc/ClientCheatAbilityPacket.hpp +++ b/LiteLoader/include/llapi/mc/ClientCheatAbilityPacket.hpp @@ -46,9 +46,9 @@ class ClientCheatAbilityPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ClientCheatAbilityPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ClientCheatAbilityPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ClientCheatAbilityPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ClientInputUpdateSystem.hpp b/LiteLoader/include/llapi/mc/ClientInputUpdateSystem.hpp index e65e13630a..ca3d0495a0 100644 --- a/LiteLoader/include/llapi/mc/ClientInputUpdateSystem.hpp +++ b/LiteLoader/include/llapi/mc/ClientInputUpdateSystem.hpp @@ -27,21 +27,25 @@ class ClientInputUpdateSystem { #endif public: + /** + * @symbol ?_calculateLookDelta\@ClientInputUpdateSystem\@\@SA?AVVec2\@\@EM\@Z + */ + MCAPI static class Vec2 _calculateLookDelta(unsigned char, float); /** * @symbol ?create\@ClientInputUpdateSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); /** - * @symbol ?createAntiCheatApplySystem\@ClientInputUpdateSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?tick\@ClientInputUpdateSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@UPlayerInputRequestComponent\@\@\@\@VActorMovementProxyComponent\@\@UMoveInputComponent\@\@URawMoveInputComponent\@\@UClientInputLockComponent\@\@USynchedActorDataComponent\@\@$$CBUAbilitiesComponent\@\@UVanillaClientGameplayComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@V?$Optional\@$$CBUSneakingComponent\@\@\@\@\@\@V?$OptionalGlobalT\@$$CBUExternalDataComponent\@\@VEntityRegistryBase\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UShouldStopEmotingRequestComponent\@\@\@\@\@Z */ - MCAPI static struct TickingSystemWithInfo createAntiCheatApplySystem(); + MCAPI static void tick(class ViewT, struct PlayerInputRequestComponent>, class ActorMovementProxyComponent, struct MoveInputComponent, struct RawMoveInputComponent, struct ClientInputLockComponent, struct SynchedActorDataComponent, struct AbilitiesComponent const, struct VanillaClientGameplayComponent, class Optional const>, class Optional>, class OptionalGlobalT, class EntityModifierT); /** - * @symbol ?createAntiCheatExtractSystem\@ClientInputUpdateSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?tickBaseInput\@ClientInputUpdateSystem\@\@SAXAEAUMoveInputComponent\@\@AEAUIPlayerMovementProxy\@\@\@Z */ - MCAPI static struct TickingSystemWithInfo createAntiCheatExtractSystem(); + MCAPI static void tickBaseInput(struct MoveInputComponent &, struct IPlayerMovementProxy &); /** - * @symbol ?extractRawHIDInput\@ClientInputUpdateSystem\@\@SAXAEBVLayeredAbilities\@\@AEBVSynchedActorData\@\@_NAEAURawMoveInputComponent\@\@AEBVMoveInputHandler\@\@PEBUSneakingComponent\@\@\@Z + * @symbol ?updateClientInput\@ClientInputUpdateSystem\@\@SAXAEAUIPlayerMovementProxy\@\@AEBURawMoveInputComponent\@\@AEBUClientInputLockComponent\@\@AEAUIClientInstanceProxy\@\@AEAUMoveInputComponent\@\@M\@Z */ - MCAPI static void extractRawHIDInput(class LayeredAbilities const &, class SynchedActorData const &, bool, struct RawMoveInputComponent &, class MoveInputHandler const &, struct SneakingComponent const *); + MCAPI static void updateClientInput(struct IPlayerMovementProxy &, struct RawMoveInputComponent const &, struct ClientInputLockComponent const &, struct IClientInstanceProxy &, struct MoveInputComponent &, float); }; diff --git a/LiteLoader/include/llapi/mc/ClientInputUpdateSystemImpl.hpp b/LiteLoader/include/llapi/mc/ClientInputUpdateSystemImpl.hpp deleted file mode 100644 index 87c4413093..0000000000 --- a/LiteLoader/include/llapi/mc/ClientInputUpdateSystemImpl.hpp +++ /dev/null @@ -1,28 +0,0 @@ -/** - * @file ClientInputUpdateSystemImpl.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -namespace ClientInputUpdateSystemImpl { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA - /** - * @symbol ?updateMoveInputApply\@ClientInputUpdateSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEAVActorMovementProxyComponent\@\@AEAUMoveInputComponent\@\@\@Z - */ - MCAPI void updateMoveInputApply(class StrictEntityContext const &, class ActorMovementProxyComponent &, struct MoveInputComponent &); - /** - * @symbol ?updateMoveInputExtract\@ClientInputUpdateSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEAVActorMovementProxyComponent\@\@AEAUMoveInputComponent\@\@\@Z - */ - MCAPI void updateMoveInputExtract(class StrictEntityContext const &, class ActorMovementProxyComponent &, struct MoveInputComponent &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ClientPlayerEventCoordinator.hpp b/LiteLoader/include/llapi/mc/ClientPlayerEventCoordinator.hpp index 637d689cb6..65970f580b 100644 --- a/LiteLoader/include/llapi/mc/ClientPlayerEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/ClientPlayerEventCoordinator.hpp @@ -34,9 +34,9 @@ class ClientPlayerEventCoordinator { */ MCAPI void sendPlayerDestroyedBlock(class Player &, class Block const &); /** - * @symbol ?sendPlayerInput\@ClientPlayerEventCoordinator\@\@QEAAXAEAUIPlayerMovementProxy\@\@AEAVMoveInputHandler\@\@\@Z + * @symbol ?sendPlayerInput\@ClientPlayerEventCoordinator\@\@QEAAXAEAUIPlayerMovementProxy\@\@\@Z */ - MCAPI void sendPlayerInput(struct IPlayerMovementProxy &, class MoveInputHandler &); + MCAPI void sendPlayerInput(struct IPlayerMovementProxy &); /** * @symbol ?sendStartDestroyBlock\@ClientPlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVBlockPos\@\@AEAE\@Z */ diff --git a/LiteLoader/include/llapi/mc/ClientRequestPlaceholderBlock.hpp b/LiteLoader/include/llapi/mc/ClientRequestPlaceholderBlock.hpp index b42c71cb62..d500ebbcb8 100644 --- a/LiteLoader/include/llapi/mc/ClientRequestPlaceholderBlock.hpp +++ b/LiteLoader/include/llapi/mc/ClientRequestPlaceholderBlock.hpp @@ -40,16 +40,21 @@ class ClientRequestPlaceholderBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class ClientRequestPlaceholderBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class ClientRequestPlaceholderBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,110 +131,105 @@ class ClientRequestPlaceholderBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 176 + * @vftbl 174 * @symbol ?clip\@ClientRequestPlaceholderBlock\@\@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 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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/ClientToServerHandshakePacket.hpp b/LiteLoader/include/llapi/mc/ClientToServerHandshakePacket.hpp index d82496745d..8b1b256a96 100644 --- a/LiteLoader/include/llapi/mc/ClientToServerHandshakePacket.hpp +++ b/LiteLoader/include/llapi/mc/ClientToServerHandshakePacket.hpp @@ -51,9 +51,9 @@ class ClientToServerHandshakePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ClientToServerHandshakePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ClientToServerHandshakePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ClientToServerHandshakePacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ClientboundDebugRendererPacket.hpp b/LiteLoader/include/llapi/mc/ClientboundDebugRendererPacket.hpp index 19b4075750..6977523a24 100644 --- a/LiteLoader/include/llapi/mc/ClientboundDebugRendererPacket.hpp +++ b/LiteLoader/include/llapi/mc/ClientboundDebugRendererPacket.hpp @@ -51,9 +51,9 @@ class ClientboundDebugRendererPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ClientboundDebugRendererPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ClientboundDebugRendererPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CLIENTBOUNDDEBUGRENDERERPACKET /** * @symbol __unk_destructor_-1 @@ -64,13 +64,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\@XZ - */ - MCAPI ClientboundDebugRendererPacket(); /** * @symbol ??0ClientboundDebugRendererPacket\@\@QEAA\@W4Type\@0\@\@Z */ MCAPI ClientboundDebugRendererPacket(enum class ClientboundDebugRendererPacket::Type); + /** + * @symbol ??0ClientboundDebugRendererPacket\@\@QEAA\@XZ + */ + MCAPI ClientboundDebugRendererPacket(); }; diff --git a/LiteLoader/include/llapi/mc/ClientboundMapItemDataPacket.hpp b/LiteLoader/include/llapi/mc/ClientboundMapItemDataPacket.hpp index 616fdebbb8..95eb1aec0a 100644 --- a/LiteLoader/include/llapi/mc/ClientboundMapItemDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/ClientboundMapItemDataPacket.hpp @@ -52,9 +52,9 @@ class ClientboundMapItemDataPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ClientboundMapItemDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ClientboundMapItemDataPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CLIENTBOUNDMAPITEMDATAPACKET /** * @symbol __unk_destructor_-1 @@ -65,13 +65,13 @@ class ClientboundMapItemDataPacket : public Packet { * @symbol ??0ClientboundMapItemDataPacket\@\@QEAA\@V?$not_null\@PEAVMapItemSavedData\@\@\@gsl\@\@AEAVLevel\@\@\@Z */ MCAPI ClientboundMapItemDataPacket(class gsl::not_null, class Level &); - /** - * @symbol ??0ClientboundMapItemDataPacket\@\@QEAA\@UActorUniqueID\@\@CAEBV?$vector\@U?$pair\@UUniqueId\@MapItemTrackedActor\@\@V?$shared_ptr\@VMapDecoration\@\@\@std\@\@\@std\@\@V?$allocator\@U?$pair\@UUniqueId\@MapItemTrackedActor\@\@V?$shared_ptr\@VMapDecoration\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@V?$buffer_span\@I\@\@HHHHV?$AutomaticID\@VDimension\@\@H\@\@_NAEBVBlockPos\@\@\@Z - */ - MCAPI ClientboundMapItemDataPacket(struct ActorUniqueID, signed char, std::vector>> const &, class buffer_span, int, int, int, int, class AutomaticID, bool, class BlockPos const &); /** * @symbol ??0ClientboundMapItemDataPacket\@\@QEAA\@XZ */ MCAPI ClientboundMapItemDataPacket(); + /** + * @symbol ??0ClientboundMapItemDataPacket\@\@QEAA\@UActorUniqueID\@\@CAEBV?$vector\@U?$pair\@UUniqueId\@MapItemTrackedActor\@\@V?$shared_ptr\@VMapDecoration\@\@\@std\@\@\@std\@\@V?$allocator\@U?$pair\@UUniqueId\@MapItemTrackedActor\@\@V?$shared_ptr\@VMapDecoration\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@V?$buffer_span\@I\@\@HHHHV?$AutomaticID\@VDimension\@\@H\@\@_NAEBVBlockPos\@\@\@Z + */ + MCAPI ClientboundMapItemDataPacket(struct ActorUniqueID, signed char, std::vector>> const &, class buffer_span, int, int, int, int, class AutomaticID, bool, class BlockPos const &); }; diff --git a/LiteLoader/include/llapi/mc/ClimateParameters.hpp b/LiteLoader/include/llapi/mc/ClimateParameters.hpp index 77bdf96364..ebd54d1fe5 100644 --- a/LiteLoader/include/llapi/mc/ClimateParameters.hpp +++ b/LiteLoader/include/llapi/mc/ClimateParameters.hpp @@ -31,9 +31,5 @@ struct ClimateParameters { * @symbol ??0ClimateParameters\@\@QEAA\@UParameter\@ClimateUtils\@\@00000M\@Z */ MCAPI ClimateParameters(struct ClimateUtils::Parameter, struct ClimateUtils::Parameter, struct ClimateUtils::Parameter, struct ClimateUtils::Parameter, struct ClimateUtils::Parameter, struct ClimateUtils::Parameter, float); - /** - * @symbol ?fitness\@ClimateParameters\@\@QEBA_JAEBUTargetPoint\@\@\@Z - */ - MCAPI __int64 fitness(struct TargetPoint const &) const; }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ClipParameters.hpp b/LiteLoader/include/llapi/mc/ClipParameters.hpp index f4e167cd32..61aae91e76 100644 --- a/LiteLoader/include/llapi/mc/ClipParameters.hpp +++ b/LiteLoader/include/llapi/mc/ClipParameters.hpp @@ -31,6 +31,10 @@ struct ClipParameters { * @symbol ??0ClipParameters\@\@QEAA\@AEBVVec3\@\@0AEBV?$function\@$$A6A_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z\@std\@\@\@Z */ MCAPI ClipParameters(class Vec3 const &, class Vec3 const &, class std::function const &); + /** + * @symbol ??0ClipParameters\@\@QEAA\@AEBVVec3\@\@0\@Z + */ + MCAPI ClipParameters(class Vec3 const &, class Vec3 const &); /** * @symbol ??1ClipParameters\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ClockItem.hpp b/LiteLoader/include/llapi/mc/ClockItem.hpp index e3e99914c5..a6d8abef38 100644 --- a/LiteLoader/include/llapi/mc/ClockItem.hpp +++ b/LiteLoader/include/llapi/mc/ClockItem.hpp @@ -36,11 +36,6 @@ class ClockItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class ClockItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -102,12 +102,22 @@ class ClockItem : public Item { */ virtual void __unk_vfn_80(); /** - * @vftbl 118 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 120 * @symbol ?getIconInfo\@ClockItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 120 + * @vftbl 122 * @symbol ?getAnimationFrameFor\@ClockItem\@\@UEBAHPEAVMob\@\@_NPEBVItemStack\@\@_N\@Z */ virtual int getAnimationFrameFor(class Mob *, bool, class ItemStack const *, bool) const; diff --git a/LiteLoader/include/llapi/mc/ClothBlock.hpp b/LiteLoader/include/llapi/mc/ClothBlock.hpp deleted file mode 100644 index a3474ff21c..0000000000 --- a/LiteLoader/include/llapi/mc/ClothBlock.hpp +++ /dev/null @@ -1,253 +0,0 @@ -/** - * @file ClothBlock.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "BlockLegacy.hpp" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class ClothBlock. - * - */ -class ClothBlock : public BlockLegacy { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CLOTHBLOCK -public: - class ClothBlock& operator=(class ClothBlock const &) = delete; - ClothBlock(class ClothBlock const &) = delete; - ClothBlock() = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); - /** - * @vftbl 30 - * @symbol __unk_vfn_30 - */ - virtual void __unk_vfn_30(); - /** - * @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 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 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 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 60 - * @symbol __unk_vfn_60 - */ - virtual void __unk_vfn_60(); - /** - * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 75 - * @symbol __unk_vfn_75 - */ - virtual void __unk_vfn_75(); - /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 105 - * @symbol __unk_vfn_105 - */ - virtual void __unk_vfn_105(); - /** - * @vftbl 123 - * @symbol __unk_vfn_123 - */ - virtual void __unk_vfn_123(); - /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 - */ - virtual void __unk_vfn_126(); - /** - * @vftbl 129 - * @symbol __unk_vfn_129 - */ - virtual void __unk_vfn_129(); - /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 - * @symbol ?buildDescriptionId\@ClothBlock\@\@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 135 - * @symbol ?isAuxValueRelevantForPicking\@ClothBlock\@\@UEBA_NXZ - */ - virtual bool isAuxValueRelevantForPicking() const; - /** - * @vftbl 157 - * @symbol __unk_vfn_157 - */ - virtual void __unk_vfn_157(); - /** - * @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 171 - * @symbol __unk_vfn_171 - */ - virtual void __unk_vfn_171(); - /** - * @vftbl 175 - * @symbol __unk_vfn_175 - */ - virtual void __unk_vfn_175(); - /** - * @vftbl 179 - * @symbol __unk_vfn_179 - */ - virtual void __unk_vfn_179(); - /** - * @vftbl 187 - * @symbol __unk_vfn_187 - */ - virtual void __unk_vfn_187(); -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CLOTHBLOCK - /** - * @symbol ?canDamperVibrations\@ClothBlock\@\@UEBA_NXZ - */ - MCVAPI bool canDamperVibrations() const; - /** - * @symbol ?canOccludeVibrations\@ClothBlock\@\@UEBA_NXZ - */ - MCVAPI bool canOccludeVibrations() const; -#endif - /** - * @symbol ??0ClothBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z - */ - MCAPI ClothBlock(std::string const &, int); - -}; diff --git a/LiteLoader/include/llapi/mc/CoalItem.hpp b/LiteLoader/include/llapi/mc/CoalItem.hpp index 95db3601f9..d674c3c73a 100644 --- a/LiteLoader/include/llapi/mc/CoalItem.hpp +++ b/LiteLoader/include/llapi/mc/CoalItem.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 CoalItem. * */ -class CoalItem : public Item { +class CoalItem : public ComponentItem { #define AFTER_EXTRA // Add Member There @@ -36,11 +36,6 @@ class CoalItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class CoalItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -107,7 +107,27 @@ class CoalItem : public Item { */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 128 + * @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\@CoalItem\@\@UEAAAEAVItem\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + */ + virtual class Item & setIconInfo(std::string const &, int); + /** + * @vftbl 120 + * @symbol ?getIconInfo\@CoalItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z + */ + virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; + /** + * @vftbl 130 * @symbol ?getFurnaceXPmultiplier\@CoalItem\@\@UEBAMAEBVItemStackBase\@\@\@Z */ virtual float getFurnaceXPmultiplier(class ItemStackBase const &) const; diff --git a/LiteLoader/include/llapi/mc/CobblestoneBlock.hpp b/LiteLoader/include/llapi/mc/CobblestoneBlock.hpp index dca5f7e0e2..e1ef41cacd 100644 --- a/LiteLoader/include/llapi/mc/CobblestoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/CobblestoneBlock.hpp @@ -40,16 +40,21 @@ class CobblestoneBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class CobblestoneBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class CobblestoneBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,110 +131,105 @@ class CobblestoneBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 - */ - virtual void __unk_vfn_157(); - /** - * @vftbl 160 + * @vftbl 158 * @symbol ?tryGetInfested\@CobblestoneBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetInfested(class Block const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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/CocoaBlock.hpp b/LiteLoader/include/llapi/mc/CocoaBlock.hpp index bbff9ed422..de44f2d634 100644 --- a/LiteLoader/include/llapi/mc/CocoaBlock.hpp +++ b/LiteLoader/include/llapi/mc/CocoaBlock.hpp @@ -40,16 +40,21 @@ class CocoaBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class CocoaBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class CocoaBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,157 +131,152 @@ class CocoaBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@CocoaBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@CocoaBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@CocoaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@CocoaBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@CocoaBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@CocoaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 + * @vftbl 171 * @symbol ?randomTick\@CocoaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@CocoaBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@CocoaBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @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 7c318525ef..468e437b15 100644 --- a/LiteLoader/include/llapi/mc/CodeBuilder.hpp +++ b/LiteLoader/include/llapi/mc/CodeBuilder.hpp @@ -45,21 +45,17 @@ 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\@\@Z + * @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 &); + 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\@\@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\@\@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\@\@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\@\@AEBUErrorMessage\@1\@\@Z */ @@ -68,6 +64,10 @@ 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/CodeBuilderPacket.hpp b/LiteLoader/include/llapi/mc/CodeBuilderPacket.hpp index b12de3e3ef..e228f09d0a 100644 --- a/LiteLoader/include/llapi/mc/CodeBuilderPacket.hpp +++ b/LiteLoader/include/llapi/mc/CodeBuilderPacket.hpp @@ -52,9 +52,9 @@ class CodeBuilderPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@CodeBuilderPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CodeBuilderPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 48a64f5eef..248a11d648 100644 --- a/LiteLoader/include/llapi/mc/CodeBuilderSourcePacket.hpp +++ b/LiteLoader/include/llapi/mc/CodeBuilderSourcePacket.hpp @@ -49,9 +49,9 @@ class CodeBuilderSourcePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@CodeBuilderSourcePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CodeBuilderSourcePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0CodeBuilderSourcePacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ColoredBlock.hpp b/LiteLoader/include/llapi/mc/ColoredTerracottaBlock.hpp similarity index 50% rename from LiteLoader/include/llapi/mc/ColoredBlock.hpp rename to LiteLoader/include/llapi/mc/ColoredTerracottaBlock.hpp index 44c9f86497..3a3a278654 100644 --- a/LiteLoader/include/llapi/mc/ColoredBlock.hpp +++ b/LiteLoader/include/llapi/mc/ColoredTerracottaBlock.hpp @@ -1,5 +1,5 @@ /** - * @file ColoredBlock.hpp + * @file ColoredTerracottaBlock.hpp * */ #pragma once @@ -8,25 +8,20 @@ #include "BlockLegacy.hpp" #define BEFORE_EXTRA -// Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC class ColoredBlock. - * - */ -class ColoredBlock : public BlockLegacy { + +class ColoredTerracottaBlock : public BlockLegacy { #define AFTER_EXTRA -// Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_COLOREDBLOCK +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_COLOREDTERRACOTTABLOCK public: - class ColoredBlock& operator=(class ColoredBlock const &) = delete; - ColoredBlock(class ColoredBlock const &) = delete; - ColoredBlock() = delete; + class ColoredTerracottaBlock& operator=(class ColoredTerracottaBlock const &) = delete; + ColoredTerracottaBlock(class ColoredTerracottaBlock const &) = delete; + ColoredTerracottaBlock() = delete; #endif public: @@ -40,16 +35,21 @@ class ColoredBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +61,10 @@ class ColoredBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +96,10 @@ class ColoredBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,138 +126,133 @@ class ColoredBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 102 + * @symbol ?asItemInstance\@ColoredTerracottaBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ - virtual void __unk_vfn_82(); + virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@ColoredBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 - * @symbol ?buildDescriptionId\@ColoredBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @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 135 - * @symbol ?isAuxValueRelevantForPicking\@ColoredBlock\@\@UEBA_NXZ + * @vftbl 133 + * @symbol ?isAuxValueRelevantForPicking\@ColoredTerracottaBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 186 - * @symbol ?getMapColor\@ColoredBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 185 + * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 - * @symbol ?getResourceItem\@ColoredBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@ColoredTerracottaBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 - * @symbol ?getSilkTouchItemInstance\@ColoredBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@ColoredTerracottaBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0ColoredBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0ColoredTerracottaBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ - MCAPI ColoredBlock(std::string const &, int, class Material const &); + MCAPI ColoredTerracottaBlock(std::string const &, int, class Material const &); }; diff --git a/LiteLoader/include/llapi/mc/ColoredTorchBlock.hpp b/LiteLoader/include/llapi/mc/ColoredTorchBlock.hpp index 0e4f8e0842..3a71d55dd1 100644 --- a/LiteLoader/include/llapi/mc/ColoredTorchBlock.hpp +++ b/LiteLoader/include/llapi/mc/ColoredTorchBlock.hpp @@ -40,16 +40,21 @@ class ColoredTorchBlock : public TorchBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class ColoredTorchBlock : public TorchBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class ColoredTorchBlock : public TorchBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,142 +131,137 @@ class ColoredTorchBlock : public TorchBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 66 + * @vftbl 65 * @symbol ?canBeUsedInCommands\@ColoredTorchBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@ColoredTorchBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@ColoredTorchBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@ColoredTorchBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@ColoredTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @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 75906a55c1..4a9c30e239 100644 --- a/LiteLoader/include/llapi/mc/Command.hpp +++ b/LiteLoader/include/llapi/mc/Command.hpp @@ -52,6 +52,7 @@ class Command { Command(class Command const &) = delete; #endif +public: public: /** * @vftbl 0 @@ -69,7 +70,7 @@ class Command { * @symbol ?execute\@SetMaxPlayersCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ public: - virtual void execute(class CommandOrigin const &, class CommandOutput &) const = 0; + virtual void execute(class CommandOrigin const&, class CommandOutput&) const = 0; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMMAND /** * @symbol __unk_destructor_-1 @@ -104,14 +105,14 @@ class Command { * @symbol ?shouldUseCommandOriginRotation\@Command\@\@SA_NAEBVCommandOrigin\@\@H\@Z */ MCAPI static bool shouldUseCommandOriginRotation(class CommandOrigin const &, int); - /** - * @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 &); + /** + * @symbol ?validRange\@Command\@\@SA_NHHHAEAVCommandOutput\@\@\@Z + */ + MCAPI static bool validRange(int, int, int, class CommandOutput &); //protected: /** diff --git a/LiteLoader/include/llapi/mc/CommandArea.hpp b/LiteLoader/include/llapi/mc/CommandArea.hpp index 61789c7bd6..49a746088d 100644 --- a/LiteLoader/include/llapi/mc/CommandArea.hpp +++ b/LiteLoader/include/llapi/mc/CommandArea.hpp @@ -31,10 +31,6 @@ class CommandArea { * @symbol ?getDimensionBlockSource\@CommandArea\@\@QEAAAEAVBlockSource\@\@XZ */ MCAPI class BlockSource & getDimensionBlockSource(); - /** - * @symbol ?getDimensionBlockSource\@CommandArea\@\@QEBAAEBVBlockSource\@\@XZ - */ - MCAPI class BlockSource const & getDimensionBlockSource() const; /** * @symbol ??1CommandArea\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/CommandBlock.hpp b/LiteLoader/include/llapi/mc/CommandBlock.hpp index 0ff428e667..fd6b6311df 100644 --- a/LiteLoader/include/llapi/mc/CommandBlock.hpp +++ b/LiteLoader/include/llapi/mc/CommandBlock.hpp @@ -40,16 +40,21 @@ class CommandBlock : public ActorBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class CommandBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class CommandBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,160 +131,155 @@ class CommandBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 73 + * @vftbl 72 * @symbol ?onRedstoneUpdate\@CommandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@CommandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@CommandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@CommandBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 127 + * @vftbl 125 * @symbol ?getComparatorSignal\@CommandBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@CommandBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?getMappedFace\@CommandBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@CommandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@CommandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@CommandBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #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 e0445214d9..da4e8b5392 100644 --- a/LiteLoader/include/llapi/mc/CommandBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/CommandBlockActor.hpp @@ -121,22 +121,22 @@ class CommandBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); /** - * @vftbl 37 + * @vftbl 39 * @symbol ?_getUpdatePacket\@CommandBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 38 + * @vftbl 40 * @symbol ?_onUpdatePacket\@CommandBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @vftbl 39 + * @vftbl 41 * @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 933cd9fcd5..b0bf5aa053 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\@$$QEAV0\@\@Z - */ - MCAPI CommandBlockComponent(class CommandBlockComponent &&); /** * @symbol ??0CommandBlockComponent\@\@QEAA\@XZ */ MCAPI CommandBlockComponent(); + /** + * @symbol ??0CommandBlockComponent\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI CommandBlockComponent(class CommandBlockComponent &&); /** * @symbol ?addAdditionalSaveData\@CommandBlockComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CommandBlockName.hpp b/LiteLoader/include/llapi/mc/CommandBlockName.hpp index b5f17658bc..b2a7391ada 100644 --- a/LiteLoader/include/llapi/mc/CommandBlockName.hpp +++ b/LiteLoader/include/llapi/mc/CommandBlockName.hpp @@ -45,16 +45,16 @@ class CommandBlockName { */ MCAPI operator unsigned __int64() const; /** - * @symbol ?resolveBlock\@CommandBlockName\@\@QEBA?AVCommandBlockNameResult\@\@AEBV?$vector\@VBlockStateCommandParam\@\@V?$allocator\@VBlockStateCommandParam\@\@\@std\@\@\@std\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?resolveBlock\@CommandBlockName\@\@QEBA?AVCommandBlockNameResult\@\@H\@Z */ - MCAPI class CommandBlockNameResult resolveBlock(std::vector const &, class CommandOutput &) const; + MCAPI class CommandBlockNameResult resolveBlock(int) const; /** * @symbol ?resolveBlock\@CommandBlockName\@\@QEBA?AVCommandBlockNameResult\@\@AEBV?$vector\@VBlockStateCommandParam\@\@V?$allocator\@VBlockStateCommandParam\@\@\@std\@\@\@std\@\@HAEAVCommandOutput\@\@\@Z */ MCAPI class CommandBlockNameResult resolveBlock(std::vector const &, int, class CommandOutput &) const; /** - * @symbol ?resolveBlock\@CommandBlockName\@\@QEBA?AVCommandBlockNameResult\@\@H\@Z + * @symbol ?resolveBlock\@CommandBlockName\@\@QEBA?AVCommandBlockNameResult\@\@AEBV?$vector\@VBlockStateCommandParam\@\@V?$allocator\@VBlockStateCommandParam\@\@\@std\@\@\@std\@\@AEAVCommandOutput\@\@\@Z */ - MCAPI class CommandBlockNameResult resolveBlock(int) const; + MCAPI class CommandBlockNameResult resolveBlock(std::vector const &, class CommandOutput &) const; }; diff --git a/LiteLoader/include/llapi/mc/CommandBlockUpdatePacket.hpp b/LiteLoader/include/llapi/mc/CommandBlockUpdatePacket.hpp index 4edc3c7077..7ecdfd8fe6 100644 --- a/LiteLoader/include/llapi/mc/CommandBlockUpdatePacket.hpp +++ b/LiteLoader/include/llapi/mc/CommandBlockUpdatePacket.hpp @@ -50,9 +50,9 @@ class CommandBlockUpdatePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@CommandBlockUpdatePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CommandBlockUpdatePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMMANDBLOCKUPDATEPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/CommandFlag.hpp b/LiteLoader/include/llapi/mc/CommandFlag.hpp index d04cf6fcc6..a73372fd29 100644 --- a/LiteLoader/include/llapi/mc/CommandFlag.hpp +++ b/LiteLoader/include/llapi/mc/CommandFlag.hpp @@ -1,18 +1,18 @@ #pragma once -enum class CommandFlagValue : unsigned short -{ +enum class CommandFlagValue : unsigned short { None = 0x00, Usage = 0x01, Visibility2 = 0x02, Visibility4 = 0x04, - Visibility6 = 0x06, - Unknown8 = 0x08, + Visibility6 = 0x06, + Visibility8 = 0x08, Sync = 0x10, Execute = 0x20, Type = 0x40, Cheat = 0x80, Async = 0x100, + //Editor = 0x200; }; enum class CommandUsageFlag : unsigned short { @@ -25,12 +25,8 @@ enum class CommandVisibilityFlag : unsigned short { HiddenFromCommandBlockOrigin = 0x02, HiddenFromPlayerOrigin = 0x04, Hidden = 0x06, -}; - -// -enum class CommmandUnknown8Flag : unsigned short { - None = 0x00, - Unknown = 0x08, + HiddenFromAutomationOrigin = 0x08, + Removed = 0xe, }; enum class CommandSyncFlag : unsigned short { @@ -58,6 +54,11 @@ enum class CommandAsyncFlag : unsigned short { Async = 0x100, }; +enum class CommandEditorFlag : unsigned short { + Editor = 0x0, + NoEditor = 0x200, +}; + struct CommandFlag { diff --git a/LiteLoader/include/llapi/mc/CommandOrigin.hpp b/LiteLoader/include/llapi/mc/CommandOrigin.hpp index 8b907446bb..77be7f6120 100644 --- a/LiteLoader/include/llapi/mc/CommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/CommandOrigin.hpp @@ -222,10 +222,6 @@ LIAPI ServerPlayer* getPlayer() const; * @symbol ?getAreaAtWithBuffer\@CommandOrigin\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@H\@Z */ MCAPI std::unique_ptr getAreaAtWithBuffer(class BlockPos const &, int) const; - /** - * @symbol ?isEditorWorld\@CommandOrigin\@\@QEBA_NXZ - */ - MCAPI bool isEditorWorld() const; /** * @symbol ?fromCommandOriginData\@CommandOrigin\@\@SA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@AEBUCommandOriginData\@\@AEBV?$NonOwnerPointer\@VILevel\@\@\@Bedrock\@\@AEBVNetworkIdentifier\@\@W4SubClientId\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CommandOutputPacket.hpp b/LiteLoader/include/llapi/mc/CommandOutputPacket.hpp index 35083ae7dc..a0725c5f6d 100644 --- a/LiteLoader/include/llapi/mc/CommandOutputPacket.hpp +++ b/LiteLoader/include/llapi/mc/CommandOutputPacket.hpp @@ -51,9 +51,9 @@ class CommandOutputPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@CommandOutputPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CommandOutputPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 d7058dbee7..03c37727eb 100644 --- a/LiteLoader/include/llapi/mc/CommandOutputParameter.hpp +++ b/LiteLoader/include/llapi/mc/CommandOutputParameter.hpp @@ -45,13 +45,13 @@ class CommandOutputParameter { */ MCAPI CommandOutputParameter(char const *); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@H\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@M\@Z */ - MCAPI CommandOutputParameter(int); + MCAPI CommandOutputParameter(float); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@W4NoCountType\@0\@\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@H\@Z */ - MCAPI CommandOutputParameter(enum class CommandOutputParameter::NoCountType); + MCAPI CommandOutputParameter(int); /** * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$CommandSelectorResults\@VActor\@\@\@\@\@Z */ @@ -61,37 +61,37 @@ class CommandOutputParameter { */ MCAPI CommandOutputParameter(class CommandSelectorResults const &); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@M\@Z - */ - MCAPI CommandOutputParameter(float); - /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@VBlockPos\@\@\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@_N\@Z */ - MCAPI CommandOutputParameter(class BlockPos); + MCAPI CommandOutputParameter(bool); /** * @symbol ??0CommandOutputParameter\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI CommandOutputParameter(class CommandOutputParameter &&); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$vector\@PEBVActor\@\@V?$allocator\@PEBVActor\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI CommandOutputParameter(std::vector const &); + MCAPI CommandOutputParameter(std::string const &); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$vector\@PEBVPlayer\@\@V?$allocator\@PEBVPlayer\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@W4NoCountType\@0\@\@Z */ - MCAPI CommandOutputParameter(std::vector const &); + MCAPI CommandOutputParameter(enum class CommandOutputParameter::NoCountType); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@_N\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$vector\@PEBVActor\@\@V?$allocator\@PEBVActor\@\@\@std\@\@\@std\@\@\@Z */ - MCAPI CommandOutputParameter(bool); + MCAPI CommandOutputParameter(std::vector const &); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$vector\@PEBVPlayer\@\@V?$allocator\@PEBVPlayer\@\@\@std\@\@\@std\@\@\@Z */ - MCAPI CommandOutputParameter(std::string const &); + 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/CommandPropertyBag.hpp b/LiteLoader/include/llapi/mc/CommandPropertyBag.hpp index caf60174b2..973c072df7 100644 --- a/LiteLoader/include/llapi/mc/CommandPropertyBag.hpp +++ b/LiteLoader/include/llapi/mc/CommandPropertyBag.hpp @@ -38,14 +38,14 @@ class CommandPropertyBag { * @symbol ?addToResultList\@CommandPropertyBag\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCAPI void addToResultList(std::string const &, std::string const &); - /** - * @symbol ?set\@CommandPropertyBag\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VVec3\@\@\@Z - */ - MCAPI void set(std::string const &, class Vec3); /** * @symbol ?set\@CommandPropertyBag\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@\@Z */ MCAPI void set(std::string const &, class Json::Value const &); + /** + * @symbol ?set\@CommandPropertyBag\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VVec3\@\@\@Z + */ + MCAPI void set(std::string const &, class Vec3); /** * @symbol ?set\@CommandPropertyBag\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CommandRegistry.hpp b/LiteLoader/include/llapi/mc/CommandRegistry.hpp index 62ec8308e0..a21abb7462 100644 --- a/LiteLoader/include/llapi/mc/CommandRegistry.hpp +++ b/LiteLoader/include/llapi/mc/CommandRegistry.hpp @@ -575,10 +575,6 @@ 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 ?enabledInEditor\@CommandRegistry\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI bool enabledInEditor(std::string const &) const; /** * @symbol ?fireCommandParseTableTelemetry\@CommandRegistry\@\@QEBAXAEBVIMinecraftEventing\@\@_N\@Z */ @@ -765,6 +761,10 @@ class CommandRegistry { * @symbol ?buildParseTable\@CommandRegistry\@\@AEBAXI\@Z */ MCAPI void buildParseTable(unsigned int) const; + /** + * @symbol ?buildPredictTable\@CommandRegistry\@\@AEBAXAEAUParseTable\@1\@I\@Z + */ + MCAPI void buildPredictTable(struct CommandRegistry::ParseTable &, unsigned int) const; /** * @symbol ?buildRules\@CommandRegistry\@\@AEAA?AVSymbol\@1\@AEAUSignature\@1\@AEBV?$vector\@V?$not_null\@PEAUOverload\@CommandRegistry\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEAUOverload\@CommandRegistry\@\@\@gsl\@\@\@std\@\@\@std\@\@_K\@Z */ @@ -778,25 +778,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\@\@VSymbol\@1\@\@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 std::string describe(class CommandRegistry::Symbol) const; + MCAPI std::string describe(struct CommandRegistry::Signature const &, std::string const &, struct CommandRegistry::Overload const &, unsigned int, unsigned int *, unsigned int *) 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\@\@AEBUSignature\@1\@AEBV23\@AEBUOverload\@1\@IPEAI3\@Z - */ - 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 + * @symbol ?describe\@CommandRegistry\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VSymbol\@1\@\@Z */ - MCAPI struct CommandRegistry::Signature * findCommand(std::string const &); + 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 */ MCAPI struct CommandRegistry::Signature const * findCommand(std::string const &) 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 ?findEnumValue\@CommandRegistry\@\@AEBA?AVSymbol\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ @@ -809,10 +809,6 @@ class CommandRegistry { * @symbol ?findPostfix\@CommandRegistry\@\@AEBA?AVSymbol\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class CommandRegistry::Symbol findPostfix(std::string const &) const; - /** - * @symbol ?first\@CommandRegistry\@\@AEBA?AV?$vector\@VSymbol\@CommandRegistry\@\@V?$allocator\@VSymbol\@CommandRegistry\@\@\@std\@\@\@std\@\@AEAUParseTable\@1\@AEBV23\@\@Z - */ - MCAPI std::vector first(struct CommandRegistry::ParseTable &, std::vector const &) const; /** * @symbol ?forEachNonTerminal\@CommandRegistry\@\@AEBAXV?$function\@$$A6AXVSymbol\@CommandRegistry\@\@\@Z\@std\@\@\@Z */ @@ -861,6 +857,10 @@ class CommandRegistry { * @symbol ?_removeStringQuotes\@CommandRegistry\@\@CA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI static std::string _removeStringQuotes(std::string const &); + /** + * @symbol ?addNonEpsilonSymbols\@CommandRegistry\@\@CAXAEAV?$dense_set\@VSymbol\@CommandRegistry\@\@USymbolHasher\@2\@U?$equal_to\@VSymbol\@CommandRegistry\@\@\@std\@\@V?$allocator\@VSymbol\@CommandRegistry\@\@\@5\@\@entt\@\@AEBV23\@\@Z + */ + MCAPI static void addNonEpsilonSymbols(class entt::dense_set, class std::allocator> &, class entt::dense_set, class std::allocator> const &); /** * @symbol ?buildOverload\@CommandRegistry\@\@CAXAEAUOverload\@1\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CommandRequestPacket.hpp b/LiteLoader/include/llapi/mc/CommandRequestPacket.hpp index e96dd0cfa5..3992d89623 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?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CommandRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMMANDREQUESTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/CommandUtils.hpp b/LiteLoader/include/llapi/mc/CommandUtils.hpp index c4a805f191..a7ddb56d56 100644 --- a/LiteLoader/include/llapi/mc/CommandUtils.hpp +++ b/LiteLoader/include/llapi/mc/CommandUtils.hpp @@ -106,6 +106,10 @@ namespace CommandUtils { * @symbol ?isActiveTickingChunk\@CommandUtils\@\@YA_NUTick\@\@0\@Z */ MCAPI bool isActiveTickingChunk(struct Tick, struct Tick); + /** + * @symbol ?isActiveTickingChunk\@CommandUtils\@\@YA_NAEBVLevelChunk\@\@\@Z + */ + MCAPI bool isActiveTickingChunk(class LevelChunk const &); /** * @symbol ?isFunctionValid\@CommandUtils\@\@YA_NAEAVCommandOutput\@\@AEAVFunctionEntry\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CommandVersion.hpp b/LiteLoader/include/llapi/mc/CommandVersion.hpp index 0e91ccdd2e..c4976765b7 100644 --- a/LiteLoader/include/llapi/mc/CommandVersion.hpp +++ b/LiteLoader/include/llapi/mc/CommandVersion.hpp @@ -41,10 +41,6 @@ class CommandVersion { * @symbol ?covers\@CommandVersion\@\@QEBA_NAEBV1\@\@Z */ MCAPI bool covers(class CommandVersion const &) const; - /** - * @symbol ?getSemVersionFromCommandVersion\@CommandVersion\@\@QEBA?AVSemVersion\@\@XZ - */ - MCAPI class SemVersion getSemVersionFromCommandVersion() const; /** * @symbol ?isCompatible\@CommandVersion\@\@QEBA_NH\@Z */ @@ -58,9 +54,9 @@ class CommandVersion { */ MCAPI static int const CurrentVersion; /** - * @symbol ?getSemVersionFromCommandVersion\@CommandVersion\@\@SA?AVSemVersion\@\@H\@Z + * @symbol ?getLatestCompatibleSemVersion\@CommandVersion\@\@SA?AVSemVersion\@\@H\@Z */ - MCAPI static class SemVersion getSemVersionFromCommandVersion(int); + MCAPI static class SemVersion getLatestCompatibleSemVersion(int); /** * @symbol ?getVersionMapping\@CommandVersion\@\@SA?BW4CurrentCmdVersion\@\@AEBVSemVersion\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CommunitySiftProcessor.hpp b/LiteLoader/include/llapi/mc/CommunitySiftProcessor.hpp index 286e7c087b..73edf48fe9 100644 --- a/LiteLoader/include/llapi/mc/CommunitySiftProcessor.hpp +++ b/LiteLoader/include/llapi/mc/CommunitySiftProcessor.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Json.hpp" #include "Bedrock.hpp" #define BEFORE_EXTRA @@ -35,24 +36,24 @@ class CommunitySiftProcessor { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?processAnonymousMessages\@CommunitySiftProcessor\@\@UEAA?AVCallbackToken\@\@PEAVIMinecraftEventing\@\@W4TextProcessingEventOrigin\@\@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\@\@V?$function\@$$A6AXAEBV?$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\@Z\@6\@\@Z + * @symbol ?processAnonymousMessages\@CommunitySiftProcessor\@\@UEAA?AVCallbackToken\@\@PEAVIMinecraftEventing\@\@W4TextProcessingEventOrigin\@\@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\@\@V?$function\@$$A6AXAEBV?$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\@\@AEBV?$vector\@W4TextFilteringEvent\@Safety\@\@V?$allocator\@W4TextFilteringEvent\@Safety\@\@\@std\@\@\@2\@\@Z\@6\@\@Z */ - virtual class CallbackToken processAnonymousMessages(class IMinecraftEventing *, enum class TextProcessingEventOrigin, std::vector const &, class std::function const &, std::vector const &)>); + virtual class CallbackToken processAnonymousMessages(class IMinecraftEventing *, enum class TextProcessingEventOrigin, std::vector const &, class std::function const &, std::vector const &)>); /** * @vftbl 2 - * @symbol ?processMessages\@CommunitySiftProcessor\@\@UEAA?AVCallbackToken\@\@AEBVPlayer\@\@W4TextProcessingEventOrigin\@\@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\@\@V?$function\@$$A6AXAEBV?$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\@Z\@6\@\@Z + * @symbol ?processMessages\@CommunitySiftProcessor\@\@UEAA?AVCallbackToken\@\@AEBVPlayer\@\@W4TextProcessingEventOrigin\@\@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\@\@V?$function\@$$A6AXAEBV?$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\@\@AEBV?$vector\@W4TextFilteringEvent\@Safety\@\@V?$allocator\@W4TextFilteringEvent\@Safety\@\@\@std\@\@\@2\@\@Z\@6\@\@Z */ - virtual class CallbackToken processMessages(class Player const &, enum class TextProcessingEventOrigin, std::vector const &, class std::function const &, std::vector const &)>); + virtual class CallbackToken processMessages(class Player const &, enum class TextProcessingEventOrigin, std::vector const &, class std::function const &, std::vector const &)>); /** * @vftbl 3 - * @symbol ?processAnonymousNonChatText\@CommunitySiftProcessor\@\@UEAA?AVCallbackToken\@\@PEAVIMinecraftEventing\@\@W4TextProcessingEventOrigin\@\@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\@\@V?$function\@$$A6AXAEBV?$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\@Z\@6\@\@Z + * @symbol ?processAnonymousNonChatText\@CommunitySiftProcessor\@\@UEAA?AVCallbackToken\@\@PEAVIMinecraftEventing\@\@W4TextProcessingEventOrigin\@\@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\@\@V?$function\@$$A6AXAEBV?$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\@\@AEBV?$vector\@W4TextFilteringEvent\@Safety\@\@V?$allocator\@W4TextFilteringEvent\@Safety\@\@\@std\@\@\@2\@\@Z\@6\@\@Z */ - virtual class CallbackToken processAnonymousNonChatText(class IMinecraftEventing *, enum class TextProcessingEventOrigin, std::vector const &, class std::function const &, std::vector const &)>); + virtual class CallbackToken processAnonymousNonChatText(class IMinecraftEventing *, enum class TextProcessingEventOrigin, std::vector const &, class std::function const &, std::vector const &)>); /** * @vftbl 4 - * @symbol ?processNonChatText\@CommunitySiftProcessor\@\@UEAA?AVCallbackToken\@\@AEBVPlayer\@\@W4TextProcessingEventOrigin\@\@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\@\@V?$function\@$$A6AXAEBV?$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\@Z\@6\@\@Z + * @symbol ?processNonChatText\@CommunitySiftProcessor\@\@UEAA?AVCallbackToken\@\@AEBVPlayer\@\@W4TextProcessingEventOrigin\@\@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\@\@V?$function\@$$A6AXAEBV?$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\@\@AEBV?$vector\@W4TextFilteringEvent\@Safety\@\@V?$allocator\@W4TextFilteringEvent\@Safety\@\@\@std\@\@\@2\@\@Z\@6\@\@Z */ - virtual class CallbackToken processNonChatText(class Player const &, enum class TextProcessingEventOrigin, std::vector const &, class std::function const &, std::vector const &)>); + virtual class CallbackToken processNonChatText(class Player const &, enum class TextProcessingEventOrigin, std::vector const &, class std::function const &, std::vector const &)>); /** * @vftbl 5 * @symbol ?processJoinEvent\@CommunitySiftProcessor\@\@UEAAXAEBVPlayer\@\@\@Z @@ -75,25 +76,25 @@ class CommunitySiftProcessor { //private: /** - * @symbol ?_createRequest\@CommunitySiftProcessor\@\@AEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@0PEAVIMinecraftEventing\@\@0W4TextProcessingEventOrigin\@\@V?$shared_ptr\@V?$vector\@U?$pair\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@V?$allocator\@U?$pair\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@\@3\@V?$shared_ptr\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@3\@_N0H\@Z + * @symbol ?_createRequest\@CommunitySiftProcessor\@\@AEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@0PEAVIMinecraftEventing\@\@0W4TextProcessingEventOrigin\@\@V?$shared_ptr\@V?$vector\@U?$pair\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@V?$allocator\@U?$pair\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@\@3\@V?$shared_ptr\@V?$vector\@VValue\@Json\@\@V?$allocator\@VValue\@Json\@\@\@std\@\@\@std\@\@\@3\@_N0H\@Z */ - MCAPI class std::shared_ptr> _createRequest(std::string const &, std::string const &, class IMinecraftEventing *, std::string const &, enum class TextProcessingEventOrigin, class std::shared_ptr>>, class std::shared_ptr>, bool, std::string const &, int); + MCAPI class std::shared_ptr> _createRequest(std::string const &, std::string const &, class IMinecraftEventing *, std::string const &, enum class TextProcessingEventOrigin, class std::shared_ptr>>, class std::shared_ptr>, bool, std::string const &, int); /** - * @symbol ?_processAnonymousMessages\@CommunitySiftProcessor\@\@AEAA?AVCallbackToken\@\@PEAVIMinecraftEventing\@\@W4TextProcessingEventOrigin\@\@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\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@6\@V?$function\@$$A6AXAEBV?$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\@Z\@6\@\@Z + * @symbol ?_processAnonymousMessages\@CommunitySiftProcessor\@\@AEAA?AVCallbackToken\@\@PEAVIMinecraftEventing\@\@W4TextProcessingEventOrigin\@\@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\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@6\@V?$function\@$$A6AXAEBV?$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\@\@AEBV?$vector\@W4TextFilteringEvent\@Safety\@\@V?$allocator\@W4TextFilteringEvent\@Safety\@\@\@std\@\@\@2\@\@Z\@6\@\@Z */ - MCAPI class CallbackToken _processAnonymousMessages(class IMinecraftEventing *, enum class TextProcessingEventOrigin, std::vector const &, std::string const &, class std::function const &, std::vector const &)>); + MCAPI class CallbackToken _processAnonymousMessages(class IMinecraftEventing *, enum class TextProcessingEventOrigin, std::vector const &, std::string const &, class std::function const &, std::vector const &)>); /** * @symbol ?_processEvent\@CommunitySiftProcessor\@\@AEAAXAEBVPlayer\@\@W4TextProcessingEventOrigin\@\@PEBVUserEntityIdentifierComponent\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void _processEvent(class Player const &, enum class TextProcessingEventOrigin, class UserEntityIdentifierComponent const *, std::string const &); /** - * @symbol ?_processMessages\@CommunitySiftProcessor\@\@AEAA?AVCallbackToken\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0PEAVIMinecraftEventing\@\@_NW4TextProcessingEventOrigin\@\@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\@\@4\@AEBV34\@V?$function\@$$A6AXAEBV?$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\@Z\@4\@\@Z + * @symbol ?_processMessages\@CommunitySiftProcessor\@\@AEAA?AVCallbackToken\@\@AEBVPlayer\@\@_NW4TextProcessingEventOrigin\@\@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\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@6\@V?$function\@$$A6AXAEBV?$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\@\@AEBV?$vector\@W4TextFilteringEvent\@Safety\@\@V?$allocator\@W4TextFilteringEvent\@Safety\@\@\@std\@\@\@2\@\@Z\@6\@\@Z */ - MCAPI class CallbackToken _processMessages(std::string, std::string, class IMinecraftEventing *, bool, enum class TextProcessingEventOrigin, std::vector const &, std::string const &, class std::function const &, std::vector const &)>); + MCAPI class CallbackToken _processMessages(class Player const &, bool, enum class TextProcessingEventOrigin, std::vector const &, std::string const &, class std::function const &, std::vector const &)>); /** - * @symbol ?_processMessages\@CommunitySiftProcessor\@\@AEAA?AVCallbackToken\@\@AEBVPlayer\@\@_NW4TextProcessingEventOrigin\@\@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\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@6\@V?$function\@$$A6AXAEBV?$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\@Z\@6\@\@Z + * @symbol ?_processMessages\@CommunitySiftProcessor\@\@AEAA?AVCallbackToken\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0PEAVIMinecraftEventing\@\@_NW4TextProcessingEventOrigin\@\@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\@\@4\@AEBV34\@V?$function\@$$A6AXAEBV?$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\@\@AEBV?$vector\@W4TextFilteringEvent\@Safety\@\@V?$allocator\@W4TextFilteringEvent\@Safety\@\@\@std\@\@\@2\@\@Z\@4\@\@Z */ - MCAPI class CallbackToken _processMessages(class Player const &, bool, enum class TextProcessingEventOrigin, std::vector const &, std::string const &, class std::function const &, std::vector const &)>); + MCAPI class CallbackToken _processMessages(std::string, std::string, class IMinecraftEventing *, bool, enum class TextProcessingEventOrigin, std::vector const &, std::string const &, class std::function const &, std::vector const &)>); /** * @symbol ?_validateCommunitySiftConfiguration\@CommunitySiftProcessor\@\@AEAA_NXZ */ @@ -102,6 +103,10 @@ class CommunitySiftProcessor { * @symbol ?_createConfigFromJson\@CommunitySiftProcessor\@\@CA?AUCommunitySiftConfig\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static struct CommunitySiftConfig _createConfigFromJson(std::string const &); + /** + * @symbol ?_processJsonEvents\@CommunitySiftProcessor\@\@CA?BV?$vector\@W4TextFilteringEvent\@Safety\@\@V?$allocator\@W4TextFilteringEvent\@Safety\@\@\@std\@\@\@std\@\@AEBV?$vector\@VValue\@Json\@\@V?$allocator\@VValue\@Json\@\@\@std\@\@\@3\@MW4ChatFloodingAction\@Safety\@\@\@Z + */ + MCAPI static std::vector const _processJsonEvents(std::vector const &, float, enum class Safety::ChatFloodingAction); private: diff --git a/LiteLoader/include/llapi/mc/ComparatorBlock.hpp b/LiteLoader/include/llapi/mc/ComparatorBlock.hpp index 85f156bc48..b2e800ddf9 100644 --- a/LiteLoader/include/llapi/mc/ComparatorBlock.hpp +++ b/LiteLoader/include/llapi/mc/ComparatorBlock.hpp @@ -40,16 +40,21 @@ class ComparatorBlock : public ActorBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class ComparatorBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class ComparatorBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,187 +131,182 @@ class ComparatorBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 51 + * @vftbl 50 * @symbol ?isSignalSource\@ComparatorBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_53(); /** - * @vftbl 59 + * @vftbl 58 * @symbol ?getDirectSignal\@ComparatorBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual int getDirectSignal(class BlockSource &, class BlockPos const &, int) const; + /** + * @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 64 + * @vftbl 63 * @symbol ?shouldConnectToRedstone\@ComparatorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 73 + * @vftbl 72 * @symbol ?onRedstoneUpdate\@ComparatorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@ComparatorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@ComparatorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@ComparatorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@ComparatorBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 116 + * @vftbl 115 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@ComparatorBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 148 + * @vftbl 146 * @symbol ?canSpawnOn\@ComparatorBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@ComparatorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@ComparatorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@ComparatorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@ComparatorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @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 090c357fd8..64726799d0 100644 --- a/LiteLoader/include/llapi/mc/ComparatorBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ComparatorBlockActor.hpp @@ -86,17 +86,17 @@ class ComparatorBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); /** - * @vftbl 40 + * @vftbl 42 * @symbol ?getOutputSignal\@ComparatorBlockActor\@\@UEAAHXZ */ virtual int getOutputSignal(); /** - * @vftbl 41 + * @vftbl 43 * @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 0677e5c8c0..95beeb57e2 100644 --- a/LiteLoader/include/llapi/mc/CompassItem.hpp +++ b/LiteLoader/include/llapi/mc/CompassItem.hpp @@ -36,11 +36,6 @@ class CompassItem : public AbstractCompassItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class CompassItem : public AbstractCompassItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -102,7 +102,17 @@ class CompassItem : public AbstractCompassItem { */ virtual void __unk_vfn_80(); /** - * @vftbl 132 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 134 * @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 57cd44e665..a5b1fe3859 100644 --- a/LiteLoader/include/llapi/mc/CompletedUsingItemPacket.hpp +++ b/LiteLoader/include/llapi/mc/CompletedUsingItemPacket.hpp @@ -51,9 +51,9 @@ class CompletedUsingItemPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@CompletedUsingItemPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CompletedUsingItemPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMPLETEDUSINGITEMPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ComplexInventoryTransaction.hpp b/LiteLoader/include/llapi/mc/ComplexInventoryTransaction.hpp index d1941d5ba2..5533b5f27c 100644 --- a/LiteLoader/include/llapi/mc/ComplexInventoryTransaction.hpp +++ b/LiteLoader/include/llapi/mc/ComplexInventoryTransaction.hpp @@ -87,14 +87,14 @@ InventoryTransaction data; * @symbol ??0ComplexInventoryTransaction\@\@QEAA\@W4Type\@0\@\@Z */ MCAPI ComplexInventoryTransaction(enum class ComplexInventoryTransaction::Type); - /** - * @symbol ?fromType\@ComplexInventoryTransaction\@\@SA?AV?$unique_ptr\@VComplexInventoryTransaction\@\@U?$default_delete\@VComplexInventoryTransaction\@\@\@std\@\@\@std\@\@W4Type\@1\@\@Z - */ - MCAPI static std::unique_ptr fromType(enum class ComplexInventoryTransaction::Type); /** * @symbol ?fromType\@ComplexInventoryTransaction\@\@SA?AV?$unique_ptr\@VComplexInventoryTransaction\@\@U?$default_delete\@VComplexInventoryTransaction\@\@\@std\@\@\@std\@\@W4Type\@1\@AEBVInventoryTransaction\@\@\@Z */ MCAPI static std::unique_ptr fromType(enum class ComplexInventoryTransaction::Type, class InventoryTransaction const &); + /** + * @symbol ?fromType\@ComplexInventoryTransaction\@\@SA?AV?$unique_ptr\@VComplexInventoryTransaction\@\@U?$default_delete\@VComplexInventoryTransaction\@\@\@std\@\@\@std\@\@W4Type\@1\@\@Z + */ + MCAPI static std::unique_ptr fromType(enum class ComplexInventoryTransaction::Type); /** * @symbol ?getTransactionTypeName\@ComplexInventoryTransaction\@\@SA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Type\@1\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ComplexItem.hpp b/LiteLoader/include/llapi/mc/ComplexItem.hpp index 5a59287d95..6bfa303d15 100644 --- a/LiteLoader/include/llapi/mc/ComplexItem.hpp +++ b/LiteLoader/include/llapi/mc/ComplexItem.hpp @@ -36,11 +36,6 @@ class ComplexItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class ComplexItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -102,7 +102,17 @@ class ComplexItem : public Item { */ virtual void __unk_vfn_80(); /** - * @vftbl 133 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 135 * @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/ComponentInfo.hpp b/LiteLoader/include/llapi/mc/ComponentInfo.hpp index 25b7dc1f2e..05b81a8851 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\@AEBU0\@\@Z - */ - MCAPI struct ComponentInfo & operator=(struct ComponentInfo const &); /** * @symbol ??4ComponentInfo\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct ComponentInfo & operator=(struct ComponentInfo &&); + /** + * @symbol ??4ComponentInfo\@\@QEAAAEAU0\@AEBU0\@\@Z + */ + MCAPI struct ComponentInfo & operator=(struct ComponentInfo const &); /** * @symbol ??1ComponentInfo\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ComponentItem.hpp b/LiteLoader/include/llapi/mc/ComponentItem.hpp index ab8ea0f58e..2419a7f008 100644 --- a/LiteLoader/include/llapi/mc/ComponentItem.hpp +++ b/LiteLoader/include/llapi/mc/ComponentItem.hpp @@ -40,9 +40,9 @@ class ComponentItem : public Item { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?initServer\@ComponentItem\@\@UEAA_NAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @symbol ?initServer\@ComponentItem\@\@UEAA_NAEAVValue\@Json\@\@AEBVSemVersion\@\@_NAEBVExperiments\@\@\@Z */ - virtual bool initServer(class Json::Value &, class SemVersion const &); + virtual bool initServer(class Json::Value &, class SemVersion const &, bool, class Experiments const &); /** * @vftbl 2 * @symbol ?tearDown\@ComponentItem\@\@UEAAXXZ @@ -60,9 +60,9 @@ class ComponentItem : public Item { virtual std::string const & getDescriptionId() const; /** * @vftbl 7 - * @symbol __unk_vfn_7 + * @symbol ?isMusicDisk\@ComponentItem\@\@UEBA_NXZ */ - virtual void __unk_vfn_7(); + virtual bool isMusicDisk() const; /** * @vftbl 10 * @symbol ?executeEvent\@ComponentItem\@\@UEBAXAEAVItemStackBase\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVRenderParams\@\@\@Z @@ -105,9 +105,9 @@ class ComponentItem : public Item { virtual bool isDyeable() const; /** * @vftbl 19 - * @symbol ?isDye\@ComponentItem\@\@UEBA_NXZ + * @symbol __unk_vfn_19 */ - virtual bool isDye() const; + virtual void __unk_vfn_19(); /** * @vftbl 22 * @symbol ?isFood\@ComponentItem\@\@UEBA_NXZ @@ -248,11 +248,6 @@ class ComponentItem : public Item { * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); - /** - * @vftbl 67 - * @symbol ?isValidAuxValue\@ComponentItem\@\@UEBA_NH\@Z - */ - virtual bool isValidAuxValue(int) const; /** * @vftbl 68 * @symbol ?getDamageChance\@ComponentItem\@\@UEBAHH\@Z @@ -383,58 +378,68 @@ class ComponentItem : public Item { * @symbol ?getCooldownTime\@ComponentItem\@\@UEBAHXZ */ virtual int getCooldownTime() const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); /** * @vftbl 116 - * @symbol ?initClient\@ComponentItem\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 118 + * @symbol ?initClient\@ComponentItem\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@_NAEBVExperiments\@\@\@Z */ - virtual void initClient(class Json::Value &, class SemVersion const &); + virtual void initClient(class Json::Value &, class SemVersion const &, bool, class Experiments const &); /** - * @vftbl 117 + * @vftbl 119 * @symbol ?setIconInfo\@ComponentItem\@\@UEAAAEAVItem\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ virtual class Item & setIconInfo(std::string const &, int); /** - * @vftbl 118 + * @vftbl 120 * @symbol ?getIconInfo\@ComponentItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 119 + * @vftbl 121 * @symbol ?getInteractText\@ComponentItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPlayer\@\@\@Z */ virtual std::string getInteractText(class Player const &) const; /** - * @vftbl 120 + * @vftbl 122 * @symbol ?getAnimationFrameFor\@ComponentItem\@\@UEBAHPEAVMob\@\@_NPEBVItemStack\@\@_N\@Z */ virtual int getAnimationFrameFor(class Mob *, bool, class ItemStack const *, bool) const; /** - * @vftbl 121 + * @vftbl 123 * @symbol ?isEmissive\@ComponentItem\@\@UEBA_NH\@Z */ virtual bool isEmissive(int) const; /** - * @vftbl 124 + * @vftbl 126 * @symbol ?canBeCharged\@ComponentItem\@\@UEBA_NXZ */ virtual bool canBeCharged() const; /** - * @vftbl 129 + * @vftbl 131 * @symbol ?getAuxValuesDescription\@ComponentItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getAuxValuesDescription() const; /** - * @vftbl 130 + * @vftbl 132 * @symbol ?_checkUseOnPermissions\@ComponentItem\@\@EEBA_NAEAVActor\@\@AEAVItemStackBase\@\@AEBEAEBVBlockPos\@\@\@Z */ virtual bool _checkUseOnPermissions(class Actor &, class ItemStackBase &, unsigned char const &, class BlockPos const &) const; /** - * @vftbl 131 + * @vftbl 133 * @symbol ?_calculatePlacePos\@ComponentItem\@\@EEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 132 + * @vftbl 134 * @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; @@ -455,6 +460,10 @@ class ComponentItem : public Item { * @symbol ?useVariant\@ComponentItem\@\@UEBA_NHH_N\@Z */ MCVAPI bool useVariant(int, int, bool) const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ComponentItem(); #endif /** * @symbol ??0ComponentItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@F\@Z @@ -469,13 +478,13 @@ class ComponentItem : public Item { */ MCAPI class std::shared_ptr> _buildItemsFileSchema(class std::shared_ptr> &, bool, class SemVersion); /** - * @symbol ?_validateClientSchemaAndInitItem\@ComponentItem\@\@QEAA_NAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @symbol ?_validateClientSchemaAndInitItem\@ComponentItem\@\@QEAA_NAEAVValue\@Json\@\@AEBVSemVersion\@\@_NAEBVExperiments\@\@\@Z */ - MCAPI bool _validateClientSchemaAndInitItem(class Json::Value &, class SemVersion const &); + MCAPI bool _validateClientSchemaAndInitItem(class Json::Value &, class SemVersion const &, bool, class Experiments const &); /** - * @symbol ?_validateServerSchemaAndInitItem\@ComponentItem\@\@QEAA_NAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @symbol ?_validateServerSchemaAndInitItem\@ComponentItem\@\@QEAA_NAEAVValue\@Json\@\@AEBVSemVersion\@\@_NAEBVExperiments\@\@\@Z */ - MCAPI bool _validateServerSchemaAndInitItem(class Json::Value &, class SemVersion const &); + MCAPI bool _validateServerSchemaAndInitItem(class Json::Value &, class SemVersion const &, bool, class Experiments const &); /** * @symbol ?checkComponentDataForContentErrors\@ComponentItem\@\@QEBA_NXZ */ @@ -484,14 +493,14 @@ class ComponentItem : public Item { * @symbol ?executeTrigger\@ComponentItem\@\@QEBA_NAEAVItemStackBase\@\@AEBVDefinitionTrigger\@\@AEAVRenderParams\@\@\@Z */ MCAPI bool executeTrigger(class ItemStackBase &, class DefinitionTrigger const &, class RenderParams &) const; - /** - * @symbol ?getAliases\@ComponentItem\@\@QEBAAEBV?$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 const & getAliases() const; /** * @symbol ?parseJsonEvents\@ComponentItem\@\@QEAA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ MCAPI bool parseJsonEvents(class Json::Value const &, class SemVersion const &); + /** + * @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 */ @@ -530,6 +539,10 @@ class ComponentItem : public Item { * @symbol ?_loadItemTagsNetworkTag\@ComponentItem\@\@AEAAXAEBVListTag\@\@\@Z */ MCAPI void _loadItemTagsNetworkTag(class ListTag const &); + /** + * @symbol ?_parseCereal\@ComponentItem\@\@AEAA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@_NAEBVExperiments\@\@\@Z + */ + MCAPI bool _parseCereal(class Json::Value const &, class SemVersion const &, bool, class Experiments const &); private: /** diff --git a/LiteLoader/include/llapi/mc/ComponentItemData.hpp b/LiteLoader/include/llapi/mc/ComponentItemData.hpp new file mode 100644 index 0000000000..df81bcff7f --- /dev/null +++ b/LiteLoader/include/llapi/mc/ComponentItemData.hpp @@ -0,0 +1,36 @@ +/** + * @file ComponentItemData.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct 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 + */ + 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 new file mode 100644 index 0000000000..97b0ad1e0e --- /dev/null +++ b/LiteLoader/include/llapi/mc/ComponentItemData_v1_20.hpp @@ -0,0 +1,47 @@ +/** + * @file ComponentItemData_v1_20.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct ComponentItemData_v1_20 { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#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\@XZ + */ + MCAPI ComponentItemData_v1_20(); + /** + * @symbol ??4ComponentItemData_v1_20\@\@QEAAAEAU0\@$$QEAU0\@\@Z + */ + MCAPI struct ComponentItemData_v1_20 & operator=(struct ComponentItemData_v1_20 &&); + /** + * @symbol ??1ComponentItemData_v1_20\@\@QEAA\@XZ + */ + MCAPI ~ComponentItemData_v1_20(); + /** + * @symbol ?VERSION\@ComponentItemData_v1_20\@\@2VSemVersion\@\@B + */ + MCAPI static class SemVersion const VERSION; + /** + * @symbol ?bindType\@ComponentItemData_v1_20\@\@SAXXZ + */ + MCAPI static void bindType(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ComponentItemDescriptionData.hpp b/LiteLoader/include/llapi/mc/ComponentItemDescriptionData.hpp new file mode 100644 index 0000000000..c5513a16b5 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ComponentItemDescriptionData.hpp @@ -0,0 +1,43 @@ +/** + * @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/ComposterBlock.hpp b/LiteLoader/include/llapi/mc/ComposterBlock.hpp index 6bfa3e6be0..031a2d0d53 100644 --- a/LiteLoader/include/llapi/mc/ComposterBlock.hpp +++ b/LiteLoader/include/llapi/mc/ComposterBlock.hpp @@ -61,16 +61,21 @@ inline void emitBoneMeal(class Level& a1, class BlockSource& a2, class BlockPos * @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 + */ + virtual void __unk_vfn_28(); /** * @vftbl 29 * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -82,10 +87,10 @@ inline void emitBoneMeal(class Level& a1, class BlockSource& a2, class BlockPos */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -117,10 +122,10 @@ inline void emitBoneMeal(class Level& a1, class BlockSource& a2, class BlockPos */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -147,15 +152,15 @@ inline void emitBoneMeal(class Level& a1, class BlockSource& a2, class BlockPos */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -163,134 +168,129 @@ inline void emitBoneMeal(class Level& a1, class BlockSource& a2, class BlockPos virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@ComposterBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 + * @vftbl 73 * @symbol ?onMove\@ComposterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void onMove(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 96 + * @vftbl 95 * @symbol ?breaksFallingBlocks\@ComposterBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 127 + * @vftbl 125 * @symbol ?getComparatorSignal\@ComposterBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@ComposterBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@ComposterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@ComposterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@ComposterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@ComposterBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMPOSTERBLOCK /** * @symbol ?hasComparatorSignal\@ComposterBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/CompoundBlockVolume.hpp b/LiteLoader/include/llapi/mc/CompoundBlockVolume.hpp new file mode 100644 index 0000000000..64df84ea8b --- /dev/null +++ b/LiteLoader/include/llapi/mc/CompoundBlockVolume.hpp @@ -0,0 +1,95 @@ +/** + * @file CompoundBlockVolume.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class CompoundBlockVolume { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_COMPOUNDBLOCKVOLUME +public: + CompoundBlockVolume(class CompoundBlockVolume const &) = delete; + CompoundBlockVolume() = delete; +#endif + +public: + /** + * @symbol ?capacity\@CompoundBlockVolume\@\@QEBA_KXZ + */ + MCAPI unsigned __int64 capacity() const; + /** + * @symbol ?clear\@CompoundBlockVolume\@\@QEAAXXZ + */ + MCAPI void clear(); + /** + * @symbol ?getBoundingBox\@CompoundBlockVolume\@\@QEBA?AVBoundingBox\@\@XZ + */ + MCAPI class BoundingBox getBoundingBox() const; + /** + * @symbol ?getMax\@CompoundBlockVolume\@\@QEBA?AVBlockPos\@\@XZ + */ + MCAPI class BlockPos getMax() const; + /** + * @symbol ?getMin\@CompoundBlockVolume\@\@QEBA?AVBlockPos\@\@XZ + */ + MCAPI class BlockPos getMin() const; + /** + * @symbol ?isInside\@CompoundBlockVolume\@\@QEBA_NAEBVBlockPos\@\@\@Z + */ + MCAPI bool isInside(class BlockPos const &) const; + /** + * @symbol ??4CompoundBlockVolume\@\@QEAAAEAV0\@AEBV0\@\@Z + */ + MCAPI class CompoundBlockVolume & operator=(class CompoundBlockVolume const &); + /** + * @symbol ??8CompoundBlockVolume\@\@QEBA_NAEBV0\@\@Z + */ + MCAPI bool operator==(class CompoundBlockVolume const &) const; + /** + * @symbol ?peekLastVolume\@CompoundBlockVolume\@\@QEBA?AV?$optional\@VCompoundBlockVolumeItem\@\@\@std\@\@XZ + */ + MCAPI class std::optional peekLastVolume() const; + /** + * @symbol ?popLastVolume\@CompoundBlockVolume\@\@QEAA_NXZ + */ + MCAPI bool popLastVolume(); + /** + * @symbol ?pushVolume\@CompoundBlockVolume\@\@QEAAXAEBVCompoundBlockVolumeItem\@\@\@Z + */ + MCAPI void pushVolume(class CompoundBlockVolumeItem const &); + /** + * @symbol ?replaceOrAddLastVolume\@CompoundBlockVolume\@\@QEAA_NAEBVCompoundBlockVolumeItem\@\@\@Z + */ + MCAPI bool replaceOrAddLastVolume(class CompoundBlockVolumeItem const &); + /** + * @symbol ?translate\@CompoundBlockVolume\@\@QEAAXHHH\@Z + */ + MCAPI void translate(int, int, int); + /** + * @symbol ?volumeCount\@CompoundBlockVolume\@\@QEBA_KXZ + */ + MCAPI unsigned __int64 volumeCount() const; + /** + * @symbol ?bindType\@CompoundBlockVolume\@\@SAXXZ + */ + MCAPI static void bindType(); + +//protected: + /** + * @symbol ?_recalculateBounds\@CompoundBlockVolume\@\@IEAAXXZ + */ + MCAPI void _recalculateBounds(); + +protected: + +}; diff --git a/LiteLoader/include/llapi/mc/CompoundBlockVolumeItem.hpp b/LiteLoader/include/llapi/mc/CompoundBlockVolumeItem.hpp new file mode 100644 index 0000000000..d1d5901832 --- /dev/null +++ b/LiteLoader/include/llapi/mc/CompoundBlockVolumeItem.hpp @@ -0,0 +1,40 @@ +/** + * @file CompoundBlockVolumeItem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class CompoundBlockVolumeItem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_COMPOUNDBLOCKVOLUMEITEM +public: + class CompoundBlockVolumeItem& operator=(class CompoundBlockVolumeItem const &) = delete; + CompoundBlockVolumeItem(class CompoundBlockVolumeItem const &) = delete; + CompoundBlockVolumeItem() = delete; +#endif + +public: + /** + * @symbol ??9CompoundBlockVolumeItem\@\@QEBA_NAEBV0\@\@Z + */ + MCAPI bool operator!=(class CompoundBlockVolumeItem const &) const; + /** + * @symbol ??8CompoundBlockVolumeItem\@\@QEBA_NAEBV0\@\@Z + */ + MCAPI bool operator==(class CompoundBlockVolumeItem const &) const; + /** + * @symbol ?bindType\@CompoundBlockVolumeItem\@\@SAXXZ + */ + MCAPI static void bindType(); + +}; diff --git a/LiteLoader/include/llapi/mc/CompoundBlockVolumeIterator.hpp b/LiteLoader/include/llapi/mc/CompoundBlockVolumeIterator.hpp new file mode 100644 index 0000000000..38c9df6e49 --- /dev/null +++ b/LiteLoader/include/llapi/mc/CompoundBlockVolumeIterator.hpp @@ -0,0 +1,57 @@ +/** + * @file CompoundBlockVolumeIterator.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class CompoundBlockVolumeIterator { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_COMPOUNDBLOCKVOLUMEITERATOR +public: + class CompoundBlockVolumeIterator& operator=(class CompoundBlockVolumeIterator const &) = delete; + CompoundBlockVolumeIterator(class CompoundBlockVolumeIterator const &) = delete; + CompoundBlockVolumeIterator() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ??ECompoundBlockVolumeIterator\@\@UEAAAEAVBaseBlockLocationIterator\@\@XZ + */ + virtual class BaseBlockLocationIterator & operator++(); + /** + * @vftbl 2 + * @symbol ??ECompoundBlockVolumeIterator\@\@UEAA?AVBaseBlockLocationIterator\@\@H\@Z + */ + virtual class BaseBlockLocationIterator operator++(int); + /** + * @vftbl 3 + * @symbol ?_begin\@CompoundBlockVolumeIterator\@\@MEAAXXZ + */ + virtual void _begin(); + /** + * @vftbl 4 + * @symbol ?_end\@CompoundBlockVolumeIterator\@\@MEAAXXZ + */ + virtual void _end(); + /** + * @symbol ??0CompoundBlockVolumeIterator\@\@QEAA\@AEBVCompoundBlockVolume\@\@_N\@Z + */ + MCAPI CompoundBlockVolumeIterator(class CompoundBlockVolume const &, bool); + +}; diff --git a/LiteLoader/include/llapi/mc/CompoundItem.hpp b/LiteLoader/include/llapi/mc/CompoundItem.hpp index c145a3a384..4726549569 100644 --- a/LiteLoader/include/llapi/mc/CompoundItem.hpp +++ b/LiteLoader/include/llapi/mc/CompoundItem.hpp @@ -36,11 +36,6 @@ class CompoundItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class CompoundItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -112,12 +112,22 @@ class CompoundItem : public Item { */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 117 + * @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\@CompoundItem\@\@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 118 + * @vftbl 120 * @symbol ?getIconInfo\@CompoundItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; diff --git a/LiteLoader/include/llapi/mc/CompoundTag.hpp b/LiteLoader/include/llapi/mc/CompoundTag.hpp index eb9122f632..7a15794bde 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 ?write\@CompoundTag\@\@UEBAXAEAVIDataOutput\@\@\@Z + * @symbol __unk_vfn_2 */ - virtual void write(class IDataOutput &) const; + virtual void __unk_vfn_2(); /** * @vftbl 3 * @symbol ?load\@CompoundTag\@\@UEAAXAEAVIDataInput\@\@\@Z @@ -153,6 +153,10 @@ 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 */ @@ -194,6 +198,7 @@ class CompoundTag : public Tag { * @symbol ?deepCopy\@CompoundTag\@\@QEAAXAEBV1\@\@Z * * + * * @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. @@ -263,14 +268,14 @@ class CompoundTag : public Tag { * @symbol ?getIntTag\@CompoundTag\@\@QEBAPEBVIntTag\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ MCAPI class IntTag const * getIntTag(class std::basic_string_view>) const; - /** - * @symbol ?getList\@CompoundTag\@\@QEBAPEBVListTag\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z - */ - MCAPI class ListTag const * getList(class std::basic_string_view>) const; /** * @symbol ?getList\@CompoundTag\@\@QEAAPEAVListTag\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ MCAPI class ListTag * getList(class std::basic_string_view>); + /** + * @symbol ?getList\@CompoundTag\@\@QEBAPEBVListTag\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z + */ + MCAPI class ListTag const * getList(class std::basic_string_view>) const; /** * @symbol ?getShort\@CompoundTag\@\@QEBAFV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ @@ -295,14 +300,14 @@ class CompoundTag : public Tag { * @symbol ??4CompoundTag\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class CompoundTag & operator=(class CompoundTag &&); - /** - * @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 ?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 ?putBoolean\@CompoundTag\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ @@ -315,14 +320,14 @@ class CompoundTag : public Tag { * @symbol ?putByteArray\@CompoundTag\@\@QEAAAEAUTagMemoryChunk\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U2\@\@Z */ MCAPI struct TagMemoryChunk & putByteArray(std::string, struct TagMemoryChunk); - /** - * @symbol ?putCompound\@CompoundTag\@\@QEAAAEAV1\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V1\@\@Z - */ - MCAPI class CompoundTag & putCompound(std::string, class CompoundTag); /** * @symbol ?putCompound\@CompoundTag\@\@QEAAPEAV1\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@3\@\@Z */ MCAPI class CompoundTag * putCompound(std::string, std::unique_ptr); + /** + * @symbol ?putCompound\@CompoundTag\@\@QEAAAEAV1\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V1\@\@Z + */ + MCAPI class CompoundTag & putCompound(std::string, class CompoundTag); /** * @symbol ?putFloat\@CompoundTag\@\@QEAAAEAMV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@Z */ diff --git a/LiteLoader/include/llapi/mc/CompoundTagUpdaterBuilder.hpp b/LiteLoader/include/llapi/mc/CompoundTagUpdaterBuilder.hpp index 53d4802002..f2245a065c 100644 --- a/LiteLoader/include/llapi/mc/CompoundTagUpdaterBuilder.hpp +++ b/LiteLoader/include/llapi/mc/CompoundTagUpdaterBuilder.hpp @@ -37,6 +37,10 @@ class CompoundTagUpdaterBuilder { * @symbol ?match\@CompoundTagUpdaterBuilder\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V23\@\@Z */ MCAPI class CompoundTagUpdaterBuilder & match(std::string const &, std::string); + /** + * @symbol ?matchInteger\@CompoundTagUpdaterBuilder\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_J\@Z + */ + MCAPI class CompoundTagUpdaterBuilder & matchInteger(std::string const &, __int64); /** * @symbol ?matchLiteral\@CompoundTagUpdaterBuilder\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V23\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CompressedBiomeDefinitionListPacket.hpp b/LiteLoader/include/llapi/mc/CompressedBiomeDefinitionListPacket.hpp index 46a9d43206..feb9d92aa5 100644 --- a/LiteLoader/include/llapi/mc/CompressedBiomeDefinitionListPacket.hpp +++ b/LiteLoader/include/llapi/mc/CompressedBiomeDefinitionListPacket.hpp @@ -46,9 +46,9 @@ class CompressedBiomeDefinitionListPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 4 - * @symbol ?readExtended\@CompressedBiomeDefinitionListPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@CompressedBiomeDefinitionListPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult 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 4c4d0c9d7b..0b44617030 100644 --- a/LiteLoader/include/llapi/mc/ConcreteBlock.hpp +++ b/LiteLoader/include/llapi/mc/ConcreteBlock.hpp @@ -40,16 +40,21 @@ class ConcreteBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class ConcreteBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class ConcreteBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,137 +131,132 @@ class ConcreteBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** * @vftbl 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 55 * @symbol ?isValidAuxValue\@ConcreteBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; + /** + * @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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@ConcreteBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @symbol ?buildDescriptionId\@ConcreteBlock\@\@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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@ConcreteBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 186 + * @vftbl 185 * @symbol ?getMapColor\@ConcreteBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@ConcreteBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@ConcreteBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/ConcretePowderBlock.hpp b/LiteLoader/include/llapi/mc/ConcretePowderBlock.hpp index 71b400d949..4f492f9eda 100644 --- a/LiteLoader/include/llapi/mc/ConcretePowderBlock.hpp +++ b/LiteLoader/include/llapi/mc/ConcretePowderBlock.hpp @@ -5,7 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "HeavyBlock.hpp" +#include "FallingBlock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +16,7 @@ * @brief MC class ConcretePowderBlock. * */ -class ConcretePowderBlock : public HeavyBlock { +class ConcretePowderBlock : public FallingBlock { #define AFTER_EXTRA // Add Member There @@ -40,16 +40,21 @@ class ConcretePowderBlock : public HeavyBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class ConcretePowderBlock : public HeavyBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class ConcretePowderBlock : public HeavyBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,170 +131,165 @@ class ConcretePowderBlock : public HeavyBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** * @vftbl 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 55 * @symbol ?isValidAuxValue\@ConcretePowderBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; + /** + * @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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@ConcretePowderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@ConcretePowderBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 122 + * @vftbl 121 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@ConcretePowderBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@ConcretePowderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 186 + * @vftbl 185 * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@ConcretePowderBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@ConcretePowderBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 195 + * @vftbl 194 * @symbol ?getDustColor\@ConcretePowderBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 196 + * @vftbl 195 * @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 197 - * @symbol __unk_vfn_197 + * @vftbl 196 + * @symbol __unk_vfn_196 */ - virtual void __unk_vfn_197(); + virtual void __unk_vfn_196(); /** * @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/Concurrency.hpp b/LiteLoader/include/llapi/mc/Concurrency.hpp index 78a6b7c61a..04e7cb986d 100644 --- a/LiteLoader/include/llapi/mc/Concurrency.hpp +++ b/LiteLoader/include/llapi/mc/Concurrency.hpp @@ -23,9 +23,5 @@ namespace Concurrency { * @symbol ?get_ambient_scheduler\@Concurrency\@\@YAAEBV?$shared_ptr\@Uscheduler_interface\@Concurrency\@\@\@std\@\@XZ */ MCAPI class std::shared_ptr const & get_ambient_scheduler(); - /** - * @symbol ?task_from_result\@Concurrency\@\@YA?AV?$task\@X\@1\@AEBVtask_options\@1\@\@Z - */ - MCAPI class Concurrency::task task_from_result(class Concurrency::task_options const &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ConduitBlock.hpp b/LiteLoader/include/llapi/mc/ConduitBlock.hpp index f719fe02ae..74c2aea9f1 100644 --- a/LiteLoader/include/llapi/mc/ConduitBlock.hpp +++ b/LiteLoader/include/llapi/mc/ConduitBlock.hpp @@ -40,16 +40,21 @@ class ConduitBlock : public ActorBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class ConduitBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class ConduitBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,15 +131,15 @@ class ConduitBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -142,99 +147,94 @@ class ConduitBlock : public ActorBlock { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@ConduitBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 91 + * @vftbl 90 * @symbol ?mayPlace\@ConduitBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 51c25ef0f3..13598788b9 100644 --- a/LiteLoader/include/llapi/mc/ConduitBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ConduitBlockActor.hpp @@ -91,17 +91,17 @@ class ConduitBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); /** - * @vftbl 37 + * @vftbl 39 * @symbol ?_getUpdatePacket\@ConduitBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 38 + * @vftbl 40 * @symbol ?_onUpdatePacket\@ConduitBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/ConnectionRequest.hpp b/LiteLoader/include/llapi/mc/ConnectionRequest.hpp index 3f3f2052f5..ade0e2b73c 100644 --- a/LiteLoader/include/llapi/mc/ConnectionRequest.hpp +++ b/LiteLoader/include/llapi/mc/ConnectionRequest.hpp @@ -217,9 +217,9 @@ class ConnectionRequest { */ MCAPI ConnectionRequest(std::unique_ptr, std::string const &); /** - * @symbol ?validate\@ConnectionRequest\@\@AEBA?AV?$unique_ptr\@VCertificate\@\@U?$default_delete\@VCertificate\@\@\@std\@\@\@std\@\@V23\@_J\@Z + * @symbol ?validate\@ConnectionRequest\@\@AEBA?AV?$unique_ptr\@VCertificate\@\@U?$default_delete\@VCertificate\@\@\@std\@\@\@std\@\@V23\@_J_N\@Z */ - MCAPI std::unique_ptr validate(std::unique_ptr, __int64) const; + MCAPI std::unique_ptr validate(std::unique_ptr, __int64, bool) const; private: diff --git a/LiteLoader/include/llapi/mc/ConsumerComponent.hpp b/LiteLoader/include/llapi/mc/ConsumerComponent.hpp index 860938250c..1fa56db0bc 100644 --- a/LiteLoader/include/llapi/mc/ConsumerComponent.hpp +++ b/LiteLoader/include/llapi/mc/ConsumerComponent.hpp @@ -82,6 +82,12 @@ class ConsumerComponent : public BaseCircuitComponent { * @symbol ?getCircuitComponentType\@ConsumerComponent\@\@UEBA?AW4CircuitComponentType\@\@XZ */ virtual enum class CircuitComponentType getCircuitComponentType() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CONSUMERCOMPONENT + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ConsumerComponent(); +#endif /** * @symbol ??0ConsumerComponent\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/Container.hpp b/LiteLoader/include/llapi/mc/Container.hpp index 282dffbc1e..52c7ae7e8e 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\@SimpleContainer\@\@UEBAAEBVItemStack\@\@H\@Z + * @symbol ?getItem\@CraftingContainer\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getItem(int) const = 0; /** @@ -114,59 +114,59 @@ class Container { virtual void removeAllItems(); /** * @vftbl 14 + * @symbol ?removeAllItemsWithForceBalance\@Container\@\@UEAAXXZ + */ + virtual void removeAllItemsWithForceBalance(); + /** + * @vftbl 15 * @symbol ?dropContents\@Container\@\@UEAAXAEAVBlockSource\@\@AEBVVec3\@\@_N\@Z */ virtual void dropContents(class BlockSource &, class Vec3 const &, bool); /** - * @vftbl 15 + * @vftbl 16 * @symbol ?getContainerSize\@FillingContainer\@\@UEBAHXZ */ virtual int getContainerSize() const = 0; /** - * @vftbl 16 + * @vftbl 17 * @symbol ?getMaxStackSize\@SimpleContainer\@\@UEBAHXZ */ virtual int getMaxStackSize() const = 0; /** - * @vftbl 17 + * @vftbl 18 * @symbol ?startOpen\@FillingContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void startOpen(class Player &) = 0; /** - * @vftbl 18 + * @vftbl 19 * @symbol ?stopOpen\@CraftingContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void stopOpen(class Player &) = 0; /** - * @vftbl 19 + * @vftbl 20 * @symbol ?getSlotCopies\@Container\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getSlotCopies() const; /** - * @vftbl 20 + * @vftbl 21 * @symbol ?getSlots\@Container\@\@UEBA?BV?$vector\@PEBVItemStack\@\@V?$allocator\@PEBVItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const getSlots() const; /** - * @vftbl 21 + * @vftbl 22 * @symbol ?getEmptySlotsCount\@Container\@\@UEBAHXZ */ virtual int getEmptySlotsCount() const; /** - * @vftbl 22 + * @vftbl 23 * @symbol ?getItemCount\@Container\@\@UEBAHAEBVItemStack\@\@\@Z */ virtual int getItemCount(class ItemStack const &) const; /** - * @vftbl 23 + * @vftbl 24 * @symbol ?findFirstSlotForItem\@Container\@\@UEBAHAEBVItemStack\@\@\@Z */ virtual int findFirstSlotForItem(class ItemStack const &) const; - /** - * @vftbl 24 - * @symbol __unk_vfn_24 - */ - virtual void __unk_vfn_24(); /** * @vftbl 25 * @symbol __unk_vfn_25 @@ -174,46 +174,51 @@ class Container { virtual void __unk_vfn_25(); /** * @vftbl 26 + * @symbol __unk_vfn_26 + */ + virtual void __unk_vfn_26(); + /** + * @vftbl 27 * @symbol ?setContainerChanged\@Container\@\@UEAAXH\@Z */ virtual void setContainerChanged(int); /** - * @vftbl 27 + * @vftbl 28 * @symbol ?setContainerMoved\@Container\@\@UEAAXXZ */ virtual void setContainerMoved(); /** - * @vftbl 28 + * @vftbl 29 * @symbol ?setCustomName\@Container\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void setCustomName(std::string const &); /** - * @vftbl 29 + * @vftbl 30 * @symbol ?hasCustomName\@Container\@\@UEBA_NXZ */ virtual bool hasCustomName() const; /** - * @vftbl 30 + * @vftbl 31 * @symbol ?readAdditionalSaveData\@Container\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &); /** - * @vftbl 31 + * @vftbl 32 * @symbol ?addAdditionalSaveData\@Container\@\@UEAAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &); /** - * @vftbl 32 + * @vftbl 33 * @symbol ?createTransactionContext\@Container\@\@UEAAXV?$function\@$$A6AXAEAVContainer\@\@HAEBVItemStack\@\@1\@Z\@std\@\@V?$function\@$$A6AXXZ\@3\@\@Z */ virtual void createTransactionContext(class std::function, class std::function); /** - * @vftbl 33 + * @vftbl 34 * @symbol ?initializeContainerContents\@Container\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void initializeContainerContents(class BlockSource &); /** - * @vftbl 34 + * @vftbl 35 * @symbol ?isEmpty\@Container\@\@UEBA_NXZ */ virtual bool isEmpty() const; diff --git a/LiteLoader/include/llapi/mc/ContainerClosePacket.hpp b/LiteLoader/include/llapi/mc/ContainerClosePacket.hpp index ec8c43926c..d215b65d3c 100644 --- a/LiteLoader/include/llapi/mc/ContainerClosePacket.hpp +++ b/LiteLoader/include/llapi/mc/ContainerClosePacket.hpp @@ -51,9 +51,9 @@ class ContainerClosePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ContainerClosePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ContainerClosePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 8d7e3d66ee..eb963788a9 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_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_NAEAVItemActor\@\@\@Z + */ + MCAPI bool addItem(class ItemActor &); /** * @symbol ?addItem\@ContainerComponent\@\@QEAA_NAEAVItemStack\@\@\@Z */ @@ -91,6 +91,10 @@ class ContainerComponent { * @symbol ?getContainerSize\@ContainerComponent\@\@QEBAHXZ */ MCAPI int getContainerSize() const; + /** + * @symbol ?getEmptySlotsCount\@ContainerComponent\@\@QEBAHXZ + */ + MCAPI int getEmptySlotsCount() const; /** * @symbol ?getItem\@ContainerComponent\@\@QEBAAEBVItemStack\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/ContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/ContainerManagerModel.hpp index 2cc0a26524..fd8743d7fd 100644 --- a/LiteLoader/include/llapi/mc/ContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/ContainerManagerModel.hpp @@ -61,17 +61,17 @@ class ContainerManagerModel { virtual void serverInitItemStackIds(); /** * @vftbl 6 - * @symbol ?getItemCopies\@HorseContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getItemCopies\@FurnaceContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getItemCopies() const = 0; /** * @vftbl 7 - * @symbol ?setSlot\@HorseContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z + * @symbol ?setSlot\@FurnaceContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ virtual void setSlot(int, class ItemStack const &, bool) = 0; /** * @vftbl 8 - * @symbol ?getSlot\@HorseContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z + * @symbol ?getSlot\@FurnaceContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getSlot(int) const = 0; /** @@ -81,7 +81,7 @@ class ContainerManagerModel { virtual void setData(int, int) = 0; /** * @vftbl 10 - * @symbol ?broadcastChanges\@BrewingStandContainerManagerModel\@\@UEAAXXZ + * @symbol ?broadcastChanges\@FurnaceContainerManagerModel\@\@UEAAXXZ */ virtual void broadcastChanges() = 0; /** diff --git a/LiteLoader/include/llapi/mc/ContainerOpenPacket.hpp b/LiteLoader/include/llapi/mc/ContainerOpenPacket.hpp index ec3367a3f9..a7d3114135 100644 --- a/LiteLoader/include/llapi/mc/ContainerOpenPacket.hpp +++ b/LiteLoader/include/llapi/mc/ContainerOpenPacket.hpp @@ -51,22 +51,22 @@ class ContainerOpenPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ContainerOpenPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ContainerOpenPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CONTAINEROPENPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~ContainerOpenPacket(); #endif - /** - * @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 &); + /** + * @symbol ??0ContainerOpenPacket\@\@QEAA\@XZ + */ + MCAPI ContainerOpenPacket(); }; diff --git a/LiteLoader/include/llapi/mc/ContainerScreenContext.hpp b/LiteLoader/include/llapi/mc/ContainerScreenContext.hpp index d2ee40a04b..33357cc07a 100644 --- a/LiteLoader/include/llapi/mc/ContainerScreenContext.hpp +++ b/LiteLoader/include/llapi/mc/ContainerScreenContext.hpp @@ -32,14 +32,14 @@ class ContainerScreenContext { * @symbol ??0ContainerScreenContext\@\@QEAA\@AEAVPlayer\@\@W4ContainerType\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI ContainerScreenContext(class Player &, enum class ContainerType, struct ActorUniqueID const &); - /** - * @symbol ??0ContainerScreenContext\@\@QEAA\@AEAVPlayer\@\@W4ContainerType\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI ContainerScreenContext(class Player &, enum class ContainerType, class BlockPos const &); /** * @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 3e25dd2856..42a82b350d 100644 --- a/LiteLoader/include/llapi/mc/ContainerSetDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/ContainerSetDataPacket.hpp @@ -51,9 +51,9 @@ class ContainerSetDataPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ContainerSetDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ContainerSetDataPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CONTAINERSETDATAPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ContainerValidationResult.hpp b/LiteLoader/include/llapi/mc/ContainerValidationResult.hpp index 594d9a5c07..1b1e09f1ef 100644 --- a/LiteLoader/include/llapi/mc/ContainerValidationResult.hpp +++ b/LiteLoader/include/llapi/mc/ContainerValidationResult.hpp @@ -28,14 +28,14 @@ struct ContainerValidationResult { #endif public: - /** - * @symbol ??0ContainerValidationResult\@\@QEAA\@W4ContainerValidationOutcome\@\@\@Z - */ - MCAPI ContainerValidationResult(enum class ContainerValidationOutcome); /** * @symbol ??0ContainerValidationResult\@\@QEAA\@AEBU0\@\@Z */ MCAPI ContainerValidationResult(struct ContainerValidationResult const &); + /** + * @symbol ??0ContainerValidationResult\@\@QEAA\@W4ContainerValidationOutcome\@\@\@Z + */ + MCAPI ContainerValidationResult(enum class ContainerValidationOutcome); /** * @symbol ?isSuccess\@ContainerValidationResult\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/ContainerWeakRef.hpp b/LiteLoader/include/llapi/mc/ContainerWeakRef.hpp index 058f24071f..aad2d45034 100644 --- a/LiteLoader/include/llapi/mc/ContainerWeakRef.hpp +++ b/LiteLoader/include/llapi/mc/ContainerWeakRef.hpp @@ -28,10 +28,6 @@ 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 */ @@ -40,6 +36,10 @@ 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/ContentLog.hpp b/LiteLoader/include/llapi/mc/ContentLog.hpp index f3542baeb5..14c631b48d 100644 --- a/LiteLoader/include/llapi/mc/ContentLog.hpp +++ b/LiteLoader/include/llapi/mc/ContentLog.hpp @@ -48,6 +48,10 @@ class ContentLog { * @symbol ?updateEnabledStatus\@ContentLog\@\@QEAAXXZ */ MCAPI void updateEnabledStatus(); + /** + * @symbol ?getBedrockLogAreaFromContentLogArea\@ContentLog\@\@SA?BW4LogAreaID\@\@W4LogArea\@\@\@Z + */ + MCAPI static enum class LogAreaID const getBedrockLogAreaFromContentLogArea(enum class LogArea); /** * @symbol ?getLogAreaName\@ContentLog\@\@SAPEBDW4LogArea\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ContentLogFileEndPoint.hpp b/LiteLoader/include/llapi/mc/ContentLogFileEndPoint.hpp index 430ef63a65..25da309b85 100644 --- a/LiteLoader/include/llapi/mc/ContentLogFileEndPoint.hpp +++ b/LiteLoader/include/llapi/mc/ContentLogFileEndPoint.hpp @@ -53,9 +53,9 @@ class ContentLogFileEndPoint { MCVAPI void setEnabled(bool); #endif /** - * @symbol ??0ContentLogFileEndPoint\@\@QEAA\@VPath\@Core\@\@0\@Z + * @symbol ??0ContentLogFileEndPoint\@\@QEAA\@VPath\@Core\@\@0V?$optional\@W4LogLevel\@\@\@std\@\@\@Z */ - MCAPI ContentLogFileEndPoint(class Core::Path, class Core::Path); + MCAPI ContentLogFileEndPoint(class Core::Path, class Core::Path, class std::optional); /** * @symbol ?FILE_NAME\@ContentLogFileEndPoint\@\@2V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B */ diff --git a/LiteLoader/include/llapi/mc/CooldownItemComponent.hpp b/LiteLoader/include/llapi/mc/CooldownItemComponent.hpp index 4e8d24c172..faa3705c65 100644 --- a/LiteLoader/include/llapi/mc/CooldownItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/CooldownItemComponent.hpp @@ -51,16 +51,11 @@ class CooldownItemComponent { virtual void __unk_vfn_3(); /** * @vftbl 4 - * @symbol __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 * @symbol ?buildNetworkTag\@?$NetworkedItemComponent\@VCooldownItemComponent\@\@\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 5 * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VCooldownItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/CopperBlock.hpp b/LiteLoader/include/llapi/mc/CopperBlock.hpp index fbf605d5b6..d26f049d44 100644 --- a/LiteLoader/include/llapi/mc/CopperBlock.hpp +++ b/LiteLoader/include/llapi/mc/CopperBlock.hpp @@ -46,20 +46,25 @@ class CopperBlock : public BlockLegacy { */ virtual void __unk_vfn_19(); /** - * @vftbl 28 + * @vftbl 27 * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -71,10 +76,10 @@ class CopperBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +111,10 @@ class CopperBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,115 +141,110 @@ class CopperBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_167(); - /** - * @vftbl 168 - * @symbol __unk_vfn_168 - */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_169(); /** * @vftbl 171 - * @symbol __unk_vfn_171 - */ - virtual void __unk_vfn_171(); - /** - * @vftbl 173 * @symbol ?randomTick\@CopperBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@CopperBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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/Coral.hpp b/LiteLoader/include/llapi/mc/Coral.hpp deleted file mode 100644 index 33fc1cb7dd..0000000000 --- a/LiteLoader/include/llapi/mc/Coral.hpp +++ /dev/null @@ -1,352 +0,0 @@ -/** - * @file Coral.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "BlockLegacy.hpp" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class Coral. - * - */ -class Coral : public BlockLegacy { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CORAL -public: - class Coral& operator=(class Coral const &) = delete; - Coral(class Coral const &) = delete; - Coral() = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 8 - * @symbol ?randomlyModifyPosition\@Coral\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z - */ - virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; - /** - * @vftbl 10 - * @symbol ?getAABB\@Coral\@\@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 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); - /** - * @vftbl 30 - * @symbol __unk_vfn_30 - */ - virtual void __unk_vfn_30(); - /** - * @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 ?isWaterBlocking\@Coral\@\@UEBA_NXZ - */ - virtual bool isWaterBlocking() const; - /** - * @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 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 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 55 - * @symbol ?isValidAuxValue\@Coral\@\@UEBA_NH\@Z - */ - virtual bool isValidAuxValue(int) const; - /** - * @vftbl 60 - * @symbol __unk_vfn_60 - */ - virtual void __unk_vfn_60(); - /** - * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 69 - * @symbol ?checkIsPathable\@Coral\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z - */ - virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; - /** - * @vftbl 75 - * @symbol __unk_vfn_75 - */ - virtual void __unk_vfn_75(); - /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 87 - * @symbol ?mayConsumeFertilizer\@Coral\@\@UEBA_NAEAVBlockSource\@\@\@Z - */ - virtual bool mayConsumeFertilizer(class BlockSource &) const; - /** - * @vftbl 93 - * @symbol ?mayPlaceOn\@Coral\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 99 - * @symbol ?neighborChanged\@Coral\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z - */ - virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; - /** - * @vftbl 102 - * @symbol ?spawnResources\@Coral\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z - */ - virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; - /** - * @vftbl 103 - * @symbol ?asItemInstance\@Coral\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z - */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; - /** - * @vftbl 105 - * @symbol __unk_vfn_105 - */ - virtual void __unk_vfn_105(); - /** - * @vftbl 123 - * @symbol __unk_vfn_123 - */ - virtual void __unk_vfn_123(); - /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 - */ - virtual void __unk_vfn_126(); - /** - * @vftbl 129 - * @symbol __unk_vfn_129 - */ - virtual void __unk_vfn_129(); - /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 - * @symbol ?buildDescriptionId\@Coral\@\@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 135 - * @symbol ?isAuxValueRelevantForPicking\@Coral\@\@UEBA_NXZ - */ - virtual bool isAuxValueRelevantForPicking() const; - /** - * @vftbl 136 - * @symbol ?getColor\@Coral\@\@UEBAHAEBVBlock\@\@\@Z - */ - virtual int getColor(class Block const &) const; - /** - * @vftbl 137 - * @symbol ?getColor\@Coral\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z - */ - virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; - /** - * @vftbl 147 - * @symbol ?getVariant\@Coral\@\@UEBAHAEBVBlock\@\@\@Z - */ - virtual int getVariant(class Block const &) const; - /** - * @vftbl 157 - * @symbol __unk_vfn_157 - */ - virtual void __unk_vfn_157(); - /** - * @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 ?onPlace\@Coral\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - virtual void onPlace(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 171 - * @symbol __unk_vfn_171 - */ - virtual void __unk_vfn_171(); - /** - * @vftbl 172 - * @symbol ?tick\@Coral\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z - */ - virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; - /** - * @vftbl 175 - * @symbol __unk_vfn_175 - */ - virtual void __unk_vfn_175(); - /** - * @vftbl 179 - * @symbol __unk_vfn_179 - */ - virtual void __unk_vfn_179(); - /** - * @vftbl 180 - * @symbol ?canSurvive\@Coral\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 186 - * @symbol ?getMapColor\@Coral\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z - */ - virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; - /** - * @vftbl 187 - * @symbol __unk_vfn_187 - */ - virtual void __unk_vfn_187(); - /** - * @vftbl 188 - * @symbol ?playerDestroy\@Coral\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z - */ - virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; - /** - * @vftbl 190 - * @symbol ?getResourceCount\@Coral\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z - */ - virtual int getResourceCount(class Randomize &, class Block const &, int) const; -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CORAL - /** - * @symbol ?waterSpreadCausesSpawn\@Coral\@\@UEBA_NXZ - */ - MCVAPI bool waterSpreadCausesSpawn() const; -#endif - /** - * @symbol ??0Coral\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z - */ - MCAPI Coral(std::string const &, int); - -//protected: - /** - * @symbol ?checkAlive\@Coral\@\@IEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI void checkAlive(class BlockSource &, class BlockPos const &) const; - -protected: - -}; diff --git a/LiteLoader/include/llapi/mc/CoralBlock.hpp b/LiteLoader/include/llapi/mc/CoralBlock.hpp index 7568180254..2f7202d5ad 100644 --- a/LiteLoader/include/llapi/mc/CoralBlock.hpp +++ b/LiteLoader/include/llapi/mc/CoralBlock.hpp @@ -40,16 +40,21 @@ class CoralBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class CoralBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class CoralBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,152 +131,152 @@ class CoralBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** * @vftbl 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 55 * @symbol ?isValidAuxValue\@CoralBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; + /** + * @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 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 92 + * @symbol ?mayPlaceOn\@CoralBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_82(); + virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@CoralBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@CoralBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@CoralBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@CoralBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@CoralBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@CoralBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 186 + * @vftbl 185 * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @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 92c5350a15..da54dc26fb 100644 --- a/LiteLoader/include/llapi/mc/CoralFan.hpp +++ b/LiteLoader/include/llapi/mc/CoralFan.hpp @@ -5,7 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "BlockLegacy.hpp" +#include "BushBlock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +16,7 @@ * @brief MC class CoralFan. * */ -class CoralFan : public BlockLegacy { +class CoralFan : public BushBlock { #define AFTER_EXTRA // Add Member There @@ -50,16 +50,21 @@ class CoralFan : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -72,14 +77,14 @@ class CoralFan : public BlockLegacy { virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol __unk_vfn_34 + * @symbol ?isWaterBlocking\@CoralFan\@\@UEBA_NXZ */ - virtual void __unk_vfn_34(); + virtual bool isWaterBlocking() const; /** * @vftbl 35 - * @symbol ?isWaterBlocking\@CoralFan\@\@UEBA_NXZ + * @symbol __unk_vfn_35 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -111,10 +116,10 @@ class CoralFan : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -141,20 +146,20 @@ class CoralFan : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** * @vftbl 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 55 * @symbol ?isValidAuxValue\@CoralFan\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; + /** + * @vftbl 59 + * @symbol __unk_vfn_59 + */ + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -162,181 +167,176 @@ class CoralFan : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@CoralFan\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 69 + * @vftbl 68 * @symbol ?checkIsPathable\@CoralFan\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 87 + * @vftbl 86 * @symbol ?mayConsumeFertilizer\@CoralFan\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 93 + * @vftbl 92 * @symbol ?mayPlaceOn\@CoralFan\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@CoralFan\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 101 * @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 103 + * @vftbl 102 * @symbol ?asItemInstance\@CoralFan\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@CoralFan\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 136 + * @vftbl 134 * @symbol ?getColor\@CoralFan\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 137 + * @vftbl 135 * @symbol ?getColor\@CoralFan\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@CoralFan\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@CoralFan\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 186 + * @vftbl 185 * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 + * @vftbl 187 * @symbol ?playerDestroy\@CoralFan\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@CoralFan\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@CoralFan\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@CoralFan\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 195 + * @vftbl 194 * @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 e4e18151c8..c1c3279413 100644 --- a/LiteLoader/include/llapi/mc/CoralFanBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/CoralFanBlockItem.hpp @@ -36,11 +36,6 @@ class CoralFanBlockItem : public BlockItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class CoralFanBlockItem : public BlockItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 45 * @symbol ?getLevelDataForAuxValue\@CoralFanBlockItem\@\@UEBAHH\@Z @@ -112,7 +112,17 @@ class CoralFanBlockItem : public BlockItem { */ virtual void __unk_vfn_80(); /** - * @vftbl 132 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 134 * @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 64403d29dc..6a5b12f5d0 100644 --- a/LiteLoader/include/llapi/mc/CoralFanHang.hpp +++ b/LiteLoader/include/llapi/mc/CoralFanHang.hpp @@ -50,16 +50,21 @@ class CoralFanHang : public CoralFan { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -71,10 +76,10 @@ class CoralFanHang : public CoralFan { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +111,10 @@ class CoralFanHang : public CoralFan { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,157 +141,152 @@ class CoralFanHang : public CoralFan { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 93 + * @vftbl 92 * @symbol ?mayPlaceOn\@CoralFanHang\@\@EEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@CoralFanHang\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@CoralFanHang\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 147 + * @vftbl 145 * @symbol ?getVariant\@CoralFanHang\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@CoralFanHang\@\@EEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@CoralFanHang\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@CoralFanHang\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@CoralFanHang\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@CoralFanHang\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 195 + * @vftbl 194 * @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 new file mode 100644 index 0000000000..90a0d3b163 --- /dev/null +++ b/LiteLoader/include/llapi/mc/CoralPlantBlock.hpp @@ -0,0 +1,307 @@ +/** + * @file CoralPlantBlock.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "BlockLegacy.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class CoralPlantBlock : public BlockLegacy { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CORALPLANTBLOCK +public: + class CoralPlantBlock& operator=(class CoralPlantBlock const &) = delete; + CoralPlantBlock(class CoralPlantBlock const &) = delete; + CoralPlantBlock() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + 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 + */ + virtual void __unk_vfn_28(); + /** + * @vftbl 29 + * @symbol __unk_vfn_29 + */ + virtual void __unk_vfn_29(); + /** + * @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 ?isWaterBlocking\@CoralPlantBlock\@\@UEBA_NXZ + */ + virtual bool isWaterBlocking() const; + /** + * @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 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 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @vftbl 59 + * @symbol __unk_vfn_59 + */ + virtual void __unk_vfn_59(); + /** + * @vftbl 60 + * @symbol __unk_vfn_60 + */ + virtual void __unk_vfn_60(); + /** + * @vftbl 68 + * @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 + */ + virtual void __unk_vfn_74(); + /** + * @vftbl 81 + * @symbol __unk_vfn_81 + */ + virtual void __unk_vfn_81(); + /** + * @vftbl 86 + * @symbol ?mayConsumeFertilizer\@CoralPlantBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z + */ + virtual bool mayConsumeFertilizer(class BlockSource &) const; + /** + * @vftbl 92 + * @symbol ?mayPlaceOn\@CoralPlantBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; + /** + * @vftbl 98 + * @symbol ?neighborChanged\@CoralPlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + */ + virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; + /** + * @vftbl 101 + * @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 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); + /** + * @vftbl 123 + * @symbol __unk_vfn_123 + */ + virtual void __unk_vfn_123(); + /** + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 + */ + virtual void __unk_vfn_127(); + /** + * @vftbl 130 + * @symbol __unk_vfn_130 + */ + virtual void __unk_vfn_130(); + /** + * @vftbl 155 + * @symbol __unk_vfn_155 + */ + virtual void __unk_vfn_155(); + /** + * @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 ?onPlace\@CoralPlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + virtual void onPlace(class BlockSource &, class BlockPos const &) const; + /** + * @vftbl 169 + * @symbol __unk_vfn_169 + */ + virtual void __unk_vfn_169(); + /** + * @vftbl 170 + * @symbol ?tick\@CoralPlantBlock\@\@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 178 + * @symbol ?canSurvive\@CoralPlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; + /** + * @vftbl 185 + * @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 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 189 + * @symbol ?getResourceCount\@CoralPlantBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + */ + virtual int getResourceCount(class Randomize &, class Block const &, int) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CORALPLANTBLOCK + /** + * @symbol ?waterSpreadCausesSpawn\@CoralPlantBlock\@\@UEBA_NXZ + */ + MCVAPI bool waterSpreadCausesSpawn() const; +#endif + /** + * @symbol ??0CoralPlantBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + */ + MCAPI CoralPlantBlock(std::string const &, int); + +//protected: + /** + * @symbol ?checkAlive\@CoralPlantBlock\@\@IEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI void checkAlive(class BlockSource &, class BlockPos const &) const; + +protected: + +}; diff --git a/LiteLoader/include/llapi/mc/CorrectPlayerMovePredictionPacket.hpp b/LiteLoader/include/llapi/mc/CorrectPlayerMovePredictionPacket.hpp index 69e96b0d22..97ec694b08 100644 --- a/LiteLoader/include/llapi/mc/CorrectPlayerMovePredictionPacket.hpp +++ b/LiteLoader/include/llapi/mc/CorrectPlayerMovePredictionPacket.hpp @@ -52,9 +52,9 @@ class CorrectPlayerMovePredictionPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@CorrectPlayerMovePredictionPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CorrectPlayerMovePredictionPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 3800b4af28..a98f369335 100644 --- a/LiteLoader/include/llapi/mc/CraftHandleNonImplemented_DEPRECATEDASKTYLAING.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandleNonImplemented_DEPRECATEDASKTYLAING.hpp @@ -40,5 +40,9 @@ 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 d780cb2ca4..b8c6b8bd2b 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\@CraftHandlerEnchant\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z + * @symbol ?_handleCraftAction\@CraftHandlerLoom\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z */ virtual enum class ItemStackNetResult _handleCraftAction(class ItemStackRequestActionCraftBase const &) = 0; /** @@ -71,5 +71,45 @@ 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 3b8f759308..ac8054d799 100644 --- a/LiteLoader/include/llapi/mc/CraftHandlerCrafting.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandlerCrafting.hpp @@ -64,12 +64,20 @@ 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: /** * @symbol ?_handleAutoCraft\@CraftHandlerCrafting\@\@AEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftRecipeAuto\@\@\@Z */ MCAPI enum class ItemStackNetResult _handleAutoCraft(class ItemStackRequestActionCraftRecipeAuto const &); + /** + * @symbol ?_handleCarefulRestoration\@CraftHandlerCrafting\@\@AEBAXAEBVItemInstance\@\@PEAVPlayer\@\@\@Z + */ + MCAPI void _handleCarefulRestoration(class ItemInstance const &, class Player *) 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 dc42b88a00..385eaca367 100644 --- a/LiteLoader/include/llapi/mc/CraftHandlerGrindstone.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandlerGrindstone.hpp @@ -56,9 +56,9 @@ class CraftHandlerGrindstone : public CraftHandlerBase { */ MCAPI int _getExperienceFromItem(class ItemStack const &) const; /** - * @symbol ?_getResultItemWithNoEnchants\@CraftHandlerGrindstone\@\@AEAA?AVItemStack\@\@AEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEA_N\@Z + * @symbol ?_getResultItemWithNoEnchants\@CraftHandlerGrindstone\@\@AEAA?AVItemStack\@\@AEAV2\@AEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEA_N\@Z */ - MCAPI class ItemStack _getResultItemWithNoEnchants(std::vector const &, bool &); + MCAPI class ItemStack _getResultItemWithNoEnchants(class ItemStack &, std::vector const &, bool &); /** * @symbol ?_resolveNetIdAndValidate\@CraftHandlerGrindstone\@\@AEAA_NW4ContainerEnumName\@\@EAEBUItemStackNetIdVariant\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CraftingContainer.hpp b/LiteLoader/include/llapi/mc/CraftingContainer.hpp index e57a15d107..2c18bca135 100644 --- a/LiteLoader/include/llapi/mc/CraftingContainer.hpp +++ b/LiteLoader/include/llapi/mc/CraftingContainer.hpp @@ -51,30 +51,25 @@ class CraftingContainer : public Container { */ virtual void setItem(int, class ItemStack const &); /** - * @vftbl 15 + * @vftbl 16 * @symbol ?getContainerSize\@CraftingContainer\@\@UEBAHXZ */ virtual int getContainerSize() const; /** - * @vftbl 16 + * @vftbl 17 * @symbol ?getMaxStackSize\@CraftingContainer\@\@UEBAHXZ */ virtual int getMaxStackSize() const; /** - * @vftbl 17 + * @vftbl 18 * @symbol ?startOpen\@CraftingContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void startOpen(class Player &); /** - * @vftbl 18 + * @vftbl 19 * @symbol ?stopOpen\@CraftingContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void stopOpen(class Player &); - /** - * @vftbl 24 - * @symbol __unk_vfn_24 - */ - virtual void __unk_vfn_24(); /** * @vftbl 25 * @symbol __unk_vfn_25 @@ -82,6 +77,11 @@ class CraftingContainer : public Container { virtual void __unk_vfn_25(); /** * @vftbl 26 + * @symbol __unk_vfn_26 + */ + virtual void __unk_vfn_26(); + /** + * @vftbl 27 * @symbol ?setContainerChanged\@CraftingContainer\@\@UEAAXH\@Z */ virtual void setContainerChanged(int); diff --git a/LiteLoader/include/llapi/mc/CraftingContext.hpp b/LiteLoader/include/llapi/mc/CraftingContext.hpp index e2cfc7d7fc..9de9e35c75 100644 --- a/LiteLoader/include/llapi/mc/CraftingContext.hpp +++ b/LiteLoader/include/llapi/mc/CraftingContext.hpp @@ -5,32 +5,65 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA #undef BEFORE_EXTRA -struct CraftingContext { +class CraftingContext { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_CRAFTINGCONTEXT public: - struct CraftingContext& operator=(struct CraftingContext const &) = delete; - CraftingContext(struct CraftingContext const &) = delete; + class CraftingContext& operator=(class CraftingContext const &) = delete; + CraftingContext(class CraftingContext const &) = delete; CraftingContext() = delete; #endif public: /** - * @symbol ??1CraftingContext\@\@QEAA\@XZ + * @symbol ??0CraftingContext\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VILevel\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ - MCAPI ~CraftingContext(); + MCAPI CraftingContext(class gsl::not_null>); + /** + * @symbol ?copyAndLockMap\@CraftingContext\@\@QEAA_NUActorUniqueID\@\@0\@Z + */ + MCAPI bool copyAndLockMap(struct ActorUniqueID, struct ActorUniqueID); + /** + * @symbol ?expandMapById\@CraftingContext\@\@QEAA?AUActorUniqueID\@\@U2\@_N\@Z + */ + MCAPI struct ActorUniqueID expandMapById(struct ActorUniqueID, bool); + /** + * @symbol ?getBaseGameVersion\@CraftingContext\@\@QEBA?AVBaseGameVersion\@\@XZ + */ + MCAPI class BaseGameVersion getBaseGameVersion() const; + /** + * @symbol ?getMapSavedData\@CraftingContext\@\@QEBAPEAVMapItemSavedData\@\@UActorUniqueID\@\@\@Z + */ + MCAPI class MapItemSavedData * getMapSavedData(struct ActorUniqueID) const; /** - * @symbol ?buildCraftingContext\@CraftingContext\@\@SA?AU1\@AEBVILevel\@\@\@Z + * @symbol ?getMapSavedData\@CraftingContext\@\@QEBAPEAVMapItemSavedData\@\@PEBVCompoundTag\@\@\@Z */ - MCAPI static struct CraftingContext buildCraftingContext(class ILevel const &); + MCAPI class MapItemSavedData * getMapSavedData(class CompoundTag const *) const; + /** + * @symbol ?getTrimMaterialRegistry\@CraftingContext\@\@QEBA?BV?$weak_ptr\@$$CBVTrimMaterialRegistry\@\@\@std\@\@XZ + */ + MCAPI class std::weak_ptr const getTrimMaterialRegistry() const; + /** + * @symbol ?getTrimPatternRegistry\@CraftingContext\@\@QEAA?BV?$weak_ptr\@VTrimPatternRegistry\@\@\@std\@\@XZ + */ + MCAPI class std::weak_ptr const getTrimPatternRegistry(); + /** + * @symbol ?getTrimPatternRegistry\@CraftingContext\@\@QEBA?BV?$weak_ptr\@$$CBVTrimPatternRegistry\@\@\@std\@\@XZ + */ + MCAPI class std::weak_ptr const getTrimPatternRegistry() const; + /** + * @symbol ??1CraftingContext\@\@QEAA\@XZ + */ + MCAPI ~CraftingContext(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CraftingDataPacket.hpp b/LiteLoader/include/llapi/mc/CraftingDataPacket.hpp index 607212c4a3..6456d3c1b7 100644 --- a/LiteLoader/include/llapi/mc/CraftingDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/CraftingDataPacket.hpp @@ -51,9 +51,9 @@ class CraftingDataPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@CraftingDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CraftingDataPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0CraftingDataPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/CraftingEventPacket.hpp b/LiteLoader/include/llapi/mc/CraftingEventPacket.hpp index 820522be5d..5b50198e85 100644 --- a/LiteLoader/include/llapi/mc/CraftingEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/CraftingEventPacket.hpp @@ -78,9 +78,9 @@ class CraftingEventPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@CraftingEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CraftingEventPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0CraftingEventPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/WorkbenchBlock.hpp b/LiteLoader/include/llapi/mc/CraftingTableBlock.hpp similarity index 50% rename from LiteLoader/include/llapi/mc/WorkbenchBlock.hpp rename to LiteLoader/include/llapi/mc/CraftingTableBlock.hpp index e817e2b559..901f02a7f4 100644 --- a/LiteLoader/include/llapi/mc/WorkbenchBlock.hpp +++ b/LiteLoader/include/llapi/mc/CraftingTableBlock.hpp @@ -1,5 +1,5 @@ /** - * @file WorkbenchBlock.hpp + * @file CraftingTableBlock.hpp * */ #pragma once @@ -8,25 +8,20 @@ #include "BlockLegacy.hpp" #define BEFORE_EXTRA -// Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC class WorkbenchBlock. - * - */ -class WorkbenchBlock : public BlockLegacy { + +class CraftingTableBlock : public BlockLegacy { #define AFTER_EXTRA -// Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_WORKBENCHBLOCK +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CRAFTINGTABLEBLOCK public: - class WorkbenchBlock& operator=(class WorkbenchBlock const &) = delete; - WorkbenchBlock(class WorkbenchBlock const &) = delete; - WorkbenchBlock() = delete; + class CraftingTableBlock& operator=(class CraftingTableBlock const &) = delete; + CraftingTableBlock(class CraftingTableBlock const &) = delete; + CraftingTableBlock() = delete; #endif public: @@ -40,16 +35,21 @@ class WorkbenchBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +61,10 @@ class WorkbenchBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +96,10 @@ class WorkbenchBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,124 +126,119 @@ class WorkbenchBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 162 - * @symbol ?_addHardCodedBlockComponents\@WorkbenchBlock\@\@UEAAXXZ + * @vftbl 160 + * @symbol ?_addHardCodedBlockComponents\@CraftingTableBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 - * @symbol ?use\@WorkbenchBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 176 + * @symbol ?use\@CraftingTableBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_WORKBENCHBLOCK + virtual void __unk_vfn_186(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CRAFTINGTABLEBLOCK /** - * @symbol ?isCraftingBlock\@WorkbenchBlock\@\@UEBA_NXZ + * @symbol ?isCraftingBlock\@CraftingTableBlock\@\@UEBA_NXZ */ MCVAPI bool isCraftingBlock() const; #endif /** - * @symbol ??0WorkbenchBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0CraftingTableBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ - MCAPI WorkbenchBlock(std::string const &, int); + MCAPI CraftingTableBlock(std::string const &, int); }; diff --git a/LiteLoader/include/llapi/mc/CreatePhotoPacket.hpp b/LiteLoader/include/llapi/mc/CreatePhotoPacket.hpp index d5d32f699e..68ac5014c6 100644 --- a/LiteLoader/include/llapi/mc/CreatePhotoPacket.hpp +++ b/LiteLoader/include/llapi/mc/CreatePhotoPacket.hpp @@ -51,9 +51,9 @@ class CreatePhotoPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@CreatePhotoPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CreatePhotoPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0CreatePhotoPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/CreativeContentPacket.hpp b/LiteLoader/include/llapi/mc/CreativeContentPacket.hpp index a6c0addec4..a1ada472cb 100644 --- a/LiteLoader/include/llapi/mc/CreativeContentPacket.hpp +++ b/LiteLoader/include/llapi/mc/CreativeContentPacket.hpp @@ -51,22 +51,22 @@ class CreativeContentPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@CreativeContentPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CreativeContentPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CREATIVECONTENTPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~CreativeContentPacket(); #endif - /** - * @symbol ??0CreativeContentPacket\@\@QEAA\@AEBV?$vector\@VCreativeItemEntry\@\@V?$allocator\@VCreativeItemEntry\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI CreativeContentPacket(std::vector const &); /** * @symbol ??0CreativeContentPacket\@\@QEAA\@XZ */ MCAPI CreativeContentPacket(); + /** + * @symbol ??0CreativeContentPacket\@\@QEAA\@AEBV?$vector\@VCreativeItemEntry\@\@V?$allocator\@VCreativeItemEntry\@\@\@std\@\@\@std\@\@\@Z + */ + MCAPI CreativeContentPacket(std::vector const &); }; diff --git a/LiteLoader/include/llapi/mc/CreatorMetadataUtils.hpp b/LiteLoader/include/llapi/mc/CreatorMetadataUtils.hpp index a2e2ffd65b..b8d3879d4c 100644 --- a/LiteLoader/include/llapi/mc/CreatorMetadataUtils.hpp +++ b/LiteLoader/include/llapi/mc/CreatorMetadataUtils.hpp @@ -23,6 +23,10 @@ namespace CreatorMetadataUtils { * @symbol ?_addCommonVanillaMetadata\@CreatorMetadataUtils\@\@YAXAEAVValue\@Json\@\@PEBD\@Z */ MCAPI void _addCommonVanillaMetadata(class Json::Value &, char const *); + /** + * @symbol ?_addOptionalPrivilegeName\@CreatorMetadataUtils\@\@YAXAEAVValue\@Json\@\@W4Privilege\@Scripting\@\@\@Z + */ + MCAPI void _addOptionalPrivilegeName(class Json::Value &, enum class Scripting::Privilege); /** * @symbol ?_generateBlocksMetadataJson\@CreatorMetadataUtils\@\@YA?AVValue\@Json\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/Creeper.hpp b/LiteLoader/include/llapi/mc/Creeper.hpp index 1bf1ac3722..980a084af6 100644 --- a/LiteLoader/include/llapi/mc/Creeper.hpp +++ b/LiteLoader/include/llapi/mc/Creeper.hpp @@ -37,140 +37,135 @@ class Creeper : public Monster { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@Creeper\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 - */ - virtual void __unk_vfn_243(); - /** - * @vftbl 245 + * @vftbl 237 * @symbol ?die\@Creeper\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); + /** + * @vftbl 252 + * @symbol __unk_vfn_252 + */ + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); - /** - * @vftbl 274 + * @vftbl 266 * @symbol ?_onSizeUpdated\@Creeper\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0Creeper\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CropBlock.hpp b/LiteLoader/include/llapi/mc/CropBlock.hpp index 24e2b20e58..30730b6ac3 100644 --- a/LiteLoader/include/llapi/mc/CropBlock.hpp +++ b/LiteLoader/include/llapi/mc/CropBlock.hpp @@ -5,7 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "BlockLegacy.hpp" +#include "BushBlock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +16,7 @@ * @brief MC class CropBlock. * */ -class CropBlock : public BlockLegacy { +class CropBlock : public BushBlock { #define AFTER_EXTRA // Add Member There @@ -50,16 +50,21 @@ class CropBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -71,10 +76,10 @@ class CropBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +111,10 @@ class CropBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,15 +141,15 @@ class CropBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -152,149 +157,139 @@ class CropBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@CropBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@CropBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@CropBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 93 + * @vftbl 92 * @symbol ?mayPlaceOn\@CropBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@CropBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 101 * @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 103 + * @vftbl 102 * @symbol ?asItemInstance\@CropBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 118 + * @vftbl 117 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@CropBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 173 + * @vftbl 171 * @symbol ?randomTick\@CropBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@CropBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); - /** - * @vftbl 195 - * @symbol __unk_vfn_195 - */ - virtual void __unk_vfn_195(); + virtual void __unk_vfn_186(); /** * @vftbl 196 * @symbol ?getBaseSeed\@CropBlock\@\@MEBA?BVItemInstance\@\@XZ @@ -330,12 +325,4 @@ class CropBlock : public BlockLegacy { */ MCAPI CropBlock(std::string const &, int); -//private: - /** - * @symbol ?getGrowthSpeed\@CropBlock\@\@AEBAMAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI float getGrowthSpeed(class BlockSource &, class BlockPos const &) const; - -private: - }; diff --git a/LiteLoader/include/llapi/mc/CropUtils.hpp b/LiteLoader/include/llapi/mc/CropUtils.hpp new file mode 100644 index 0000000000..6a4fc265a7 --- /dev/null +++ b/LiteLoader/include/llapi/mc/CropUtils.hpp @@ -0,0 +1,24 @@ +/** + * @file CropUtils.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace CropUtils { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?getGrowthSpeed\@CropUtils\@\@YAMAEBVBlockLegacy\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI float getGrowthSpeed(class BlockLegacy const &, class BlockSource const &, class BlockPos const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/CrossbowItem.hpp b/LiteLoader/include/llapi/mc/CrossbowItem.hpp index d5134b3d45..2fa71c493d 100644 --- a/LiteLoader/include/llapi/mc/CrossbowItem.hpp +++ b/LiteLoader/include/llapi/mc/CrossbowItem.hpp @@ -41,11 +41,6 @@ class CrossbowItem : public Item { * @symbol ?getMaxUseDuration\@CrossbowItem\@\@UEBAHPEBVItemStack\@\@\@Z */ virtual int getMaxUseDuration(class ItemStack const *) const; - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -61,6 +56,11 @@ class CrossbowItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -132,27 +132,37 @@ class CrossbowItem : public Item { */ virtual void enchantProjectile(class ItemStackBase const &, class Actor &) const; /** - * @vftbl 117 + * @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\@CrossbowItem\@\@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 118 + * @vftbl 120 * @symbol ?getIconInfo\@CrossbowItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 120 + * @vftbl 122 * @symbol ?getAnimationFrameFor\@CrossbowItem\@\@UEBAHPEAVMob\@\@_NPEBVItemStack\@\@_N\@Z */ virtual int getAnimationFrameFor(class Mob *, bool, class ItemStack const *, bool) const; /** - * @vftbl 124 + * @vftbl 126 * @symbol ?canBeCharged\@CrossbowItem\@\@UEBA_NXZ */ virtual bool canBeCharged() const; /** - * @vftbl 126 + * @vftbl 128 * @symbol ?playSoundIncrementally\@CrossbowItem\@\@UEBAXAEBVItemStack\@\@AEAVMob\@\@\@Z */ virtual void playSoundIncrementally(class ItemStack const &, class Mob &) const; diff --git a/LiteLoader/include/llapi/mc/CryingObsidianBlock.hpp b/LiteLoader/include/llapi/mc/CryingObsidianBlock.hpp index 82d3520f55..d77c2abfc4 100644 --- a/LiteLoader/include/llapi/mc/CryingObsidianBlock.hpp +++ b/LiteLoader/include/llapi/mc/CryingObsidianBlock.hpp @@ -40,16 +40,21 @@ class CryingObsidianBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class CryingObsidianBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class CryingObsidianBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,117 +131,112 @@ class CryingObsidianBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@CryingObsidianBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 + * @vftbl 187 * @symbol ?playerDestroy\@CryingObsidianBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 + * @vftbl 188 * @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/Crypto.hpp b/LiteLoader/include/llapi/mc/Crypto.hpp deleted file mode 100644 index f19e35978b..0000000000 --- a/LiteLoader/include/llapi/mc/Crypto.hpp +++ /dev/null @@ -1,37 +0,0 @@ -/** - * @file Crypto.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC namespace Crypto. - * - */ -namespace Crypto { - -#define AFTER_EXTRA -// Add Member There -namespace Hash { -class md5 { -public: - md5() = delete; - md5(md5 const&) = delete; - md5(md5 const&&) = delete; -}; -} // namespace Hash - -#undef AFTER_EXTRA - /** - * @symbol ?init\@Crypto\@\@YAXXZ - */ - MCAPI void init(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/CutCopperSlab.hpp b/LiteLoader/include/llapi/mc/CutCopperSlab.hpp index 52846fced3..5daeb11233 100644 --- a/LiteLoader/include/llapi/mc/CutCopperSlab.hpp +++ b/LiteLoader/include/llapi/mc/CutCopperSlab.hpp @@ -46,20 +46,25 @@ class CutCopperSlab : public SlabBlock { */ virtual void __unk_vfn_19(); /** - * @vftbl 28 + * @vftbl 27 * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -71,10 +76,10 @@ class CutCopperSlab : public SlabBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +111,10 @@ class CutCopperSlab : public SlabBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,115 +141,110 @@ class CutCopperSlab : public SlabBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_167(); - /** - * @vftbl 168 - * @symbol __unk_vfn_168 - */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_169(); /** * @vftbl 171 - * @symbol __unk_vfn_171 - */ - virtual void __unk_vfn_171(); - /** - * @vftbl 173 * @symbol ?randomTick\@CutCopperSlab\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@CutCopperSlab\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 30f77920fe..674675be06 100644 --- a/LiteLoader/include/llapi/mc/CutCopperStairs.hpp +++ b/LiteLoader/include/llapi/mc/CutCopperStairs.hpp @@ -46,20 +46,25 @@ class CutCopperStairs : public StairBlock { */ virtual void __unk_vfn_19(); /** - * @vftbl 28 + * @vftbl 27 * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -71,10 +76,10 @@ class CutCopperStairs : public StairBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +111,10 @@ class CutCopperStairs : public StairBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,115 +141,110 @@ class CutCopperStairs : public StairBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_167(); - /** - * @vftbl 168 - * @symbol __unk_vfn_168 - */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_169(); /** * @vftbl 171 - * @symbol __unk_vfn_171 - */ - virtual void __unk_vfn_171(); - /** - * @vftbl 173 * @symbol ?randomTick\@CutCopperStairs\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@CutCopperStairs\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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/DamageSensorComponent.hpp b/LiteLoader/include/llapi/mc/DamageSensorComponent.hpp index d34e63c4ef..4e98172daa 100644 --- a/LiteLoader/include/llapi/mc/DamageSensorComponent.hpp +++ b/LiteLoader/include/llapi/mc/DamageSensorComponent.hpp @@ -52,10 +52,6 @@ class DamageSensorComponent { * @symbol ??4DamageSensorComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class DamageSensorComponent & operator=(class DamageSensorComponent &&); - /** - * @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\@\@AEBVActorDamageSource\@\@H_NVVariantParameterList\@\@2\@Z */ @@ -64,6 +60,10 @@ class DamageSensorComponent { * @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); //private: /** diff --git a/LiteLoader/include/llapi/mc/DanceComponent.hpp b/LiteLoader/include/llapi/mc/DanceComponent.hpp index 6b1c1f231b..1ea35a7563 100644 --- a/LiteLoader/include/llapi/mc/DanceComponent.hpp +++ b/LiteLoader/include/llapi/mc/DanceComponent.hpp @@ -36,13 +36,13 @@ class DanceComponent { * @symbol ?inListenDistance\@DanceComponent\@\@QEBA_NAEBVVec3\@\@\@Z */ MCAPI bool inListenDistance(class Vec3 const &) const; - /** - * @symbol ?initFromDefinition\@DanceComponent\@\@QEAAXAEAVActor\@\@M\@Z - */ - MCAPI void initFromDefinition(class Actor &, float); /** * @symbol ?initFromDefinition\@DanceComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void initFromDefinition(class Actor &); + /** + * @symbol ?initFromDefinition\@DanceComponent\@\@QEAAXAEAVActor\@\@M\@Z + */ + MCAPI void initFromDefinition(class Actor &, float); }; diff --git a/LiteLoader/include/llapi/mc/DanceComponentListener.hpp b/LiteLoader/include/llapi/mc/DanceComponentListener.hpp index 0788fd6c54..daa3bd888d 100644 --- a/LiteLoader/include/llapi/mc/DanceComponentListener.hpp +++ b/LiteLoader/include/llapi/mc/DanceComponentListener.hpp @@ -40,9 +40,9 @@ class DanceComponentListener { //private: /** - * @symbol ?_onHandleLevelSoundEvent\@DanceComponentListener\@\@AEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z + * @symbol ?_onLevelSoundEvent\@DanceComponentListener\@\@AEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z */ - MCAPI void _onHandleLevelSoundEvent(enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); + MCAPI void _onLevelSoundEvent(enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); private: diff --git a/LiteLoader/include/llapi/mc/DaylightDetectorBlock.hpp b/LiteLoader/include/llapi/mc/DaylightDetectorBlock.hpp index 3a25edd032..c6ca510429 100644 --- a/LiteLoader/include/llapi/mc/DaylightDetectorBlock.hpp +++ b/LiteLoader/include/llapi/mc/DaylightDetectorBlock.hpp @@ -40,16 +40,26 @@ class DaylightDetectorBlock : public ActorBlock { * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); + /** + * @vftbl 22 + * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +71,10 @@ class DaylightDetectorBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +106,10 @@ class DaylightDetectorBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,170 +136,194 @@ class DaylightDetectorBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 51 + * @vftbl 50 * @symbol ?isSignalSource\@DaylightDetectorBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 64 + * @vftbl 63 * @symbol ?shouldConnectToRedstone\@DaylightDetectorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 69 + * @vftbl 68 * @symbol ?checkIsPathable\@DaylightDetectorBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@DaylightDetectorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@DaylightDetectorBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@DaylightDetectorBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@DaylightDetectorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@DaylightDetectorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@DaylightDetectorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@DaylightDetectorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@DaylightDetectorBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 196 + * @vftbl 195 * @symbol ?updateShape\@DaylightDetectorBlock\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void updateShape(class BlockSource &, class BlockPos const &); /** - * @vftbl 197 + * @vftbl 196 * @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 23d2b8e45d..a4ab2d187c 100644 --- a/LiteLoader/include/llapi/mc/DaylightDetectorBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/DaylightDetectorBlockActor.hpp @@ -76,9 +76,9 @@ class DaylightDetectorBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); }; diff --git a/LiteLoader/include/llapi/mc/DeadBush.hpp b/LiteLoader/include/llapi/mc/DeadBush.hpp deleted file mode 100644 index c8ca76faf5..0000000000 --- a/LiteLoader/include/llapi/mc/DeadBush.hpp +++ /dev/null @@ -1,293 +0,0 @@ -/** - * @file DeadBush.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "BlockLegacy.hpp" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class DeadBush. - * - */ -class DeadBush : public BlockLegacy { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_DEADBUSH -public: - class DeadBush& operator=(class DeadBush const &) = delete; - DeadBush(class DeadBush const &) = delete; - DeadBush() = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); - /** - * @vftbl 30 - * @symbol __unk_vfn_30 - */ - virtual void __unk_vfn_30(); - /** - * @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 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 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 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 60 - * @symbol __unk_vfn_60 - */ - virtual void __unk_vfn_60(); - /** - * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 75 - * @symbol __unk_vfn_75 - */ - virtual void __unk_vfn_75(); - /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 93 - * @symbol ?mayPlaceOn\@DeadBush\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 105 - * @symbol __unk_vfn_105 - */ - virtual void __unk_vfn_105(); - /** - * @vftbl 123 - * @symbol __unk_vfn_123 - */ - virtual void __unk_vfn_123(); - /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 - */ - virtual void __unk_vfn_126(); - /** - * @vftbl 129 - * @symbol __unk_vfn_129 - */ - virtual void __unk_vfn_129(); - /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 157 - * @symbol __unk_vfn_157 - */ - virtual void __unk_vfn_157(); - /** - * @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 171 - * @symbol __unk_vfn_171 - */ - virtual void __unk_vfn_171(); - /** - * @vftbl 175 - * @symbol __unk_vfn_175 - */ - virtual void __unk_vfn_175(); - /** - * @vftbl 179 - * @symbol __unk_vfn_179 - */ - virtual void __unk_vfn_179(); - /** - * @vftbl 187 - * @symbol __unk_vfn_187 - */ - virtual void __unk_vfn_187(); - /** - * @vftbl 188 - * @symbol ?playerDestroy\@DeadBush\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z - */ - virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; - /** - * @vftbl 189 - * @symbol ?getResourceItem\@DeadBush\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z - */ - virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; - /** - * @vftbl 190 - * @symbol ?getResourceCount\@DeadBush\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z - */ - virtual int getResourceCount(class Randomize &, class Block const &, int) const; - /** - * @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 ?_Delete_this\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEAAX_N\@Z - */ - virtual void _Delete_this(bool); - /** - * @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_DEADBUSH - /** - * @symbol ?canBeSilkTouched\@DeadBush\@\@UEBA_NXZ - */ - MCVAPI bool canBeSilkTouched() const; -#endif - /** - * @symbol ??0DeadBush\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z - */ - MCAPI DeadBush(std::string const &, int); - -}; diff --git a/LiteLoader/include/llapi/mc/DeadBushBlock.hpp b/LiteLoader/include/llapi/mc/DeadBushBlock.hpp new file mode 100644 index 0000000000..4f878876cf --- /dev/null +++ b/LiteLoader/include/llapi/mc/DeadBushBlock.hpp @@ -0,0 +1,254 @@ +/** + * @file DeadBushBlock.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "BushBlock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class DeadBushBlock : public BushBlock { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_DEADBUSHBLOCK +public: + class DeadBushBlock& operator=(class DeadBushBlock const &) = delete; + DeadBushBlock(class DeadBushBlock const &) = delete; + DeadBushBlock() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + 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(); + /** + * @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 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 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 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @vftbl 59 + * @symbol __unk_vfn_59 + */ + virtual void __unk_vfn_59(); + /** + * @vftbl 60 + * @symbol __unk_vfn_60 + */ + virtual void __unk_vfn_60(); + /** + * @vftbl 74 + * @symbol __unk_vfn_74 + */ + virtual void __unk_vfn_74(); + /** + * @vftbl 81 + * @symbol __unk_vfn_81 + */ + virtual void __unk_vfn_81(); + /** + * @vftbl 92 + * @symbol ?mayPlaceOn\@DeadBushBlock\@\@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 + */ + virtual void __unk_vfn_122(); + /** + * @vftbl 123 + * @symbol __unk_vfn_123 + */ + virtual void __unk_vfn_123(); + /** + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 + */ + virtual void __unk_vfn_127(); + /** + * @vftbl 130 + * @symbol __unk_vfn_130 + */ + virtual void __unk_vfn_130(); + /** + * @vftbl 155 + * @symbol __unk_vfn_155 + */ + virtual void __unk_vfn_155(); + /** + * @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 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 187 + * @symbol ?playerDestroy\@DeadBushBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + */ + virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; + /** + * @vftbl 188 + * @symbol ?getResourceItem\@DeadBushBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + */ + virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + /** + * @vftbl 189 + * @symbol ?getResourceCount\@DeadBushBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + */ + virtual int getResourceCount(class Randomize &, class Block const &, int) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_DEADBUSHBLOCK + /** + * @symbol ?canBeSilkTouched\@DeadBushBlock\@\@UEBA_NXZ + */ + MCVAPI bool canBeSilkTouched() const; +#endif + /** + * @symbol ??0DeadBushBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + */ + MCAPI DeadBushBlock(std::string const &, int); + +}; diff --git a/LiteLoader/include/llapi/mc/DeathInfoPacket.hpp b/LiteLoader/include/llapi/mc/DeathInfoPacket.hpp index f94898f999..a0d9ded659 100644 --- a/LiteLoader/include/llapi/mc/DeathInfoPacket.hpp +++ b/LiteLoader/include/llapi/mc/DeathInfoPacket.hpp @@ -49,9 +49,9 @@ class DeathInfoPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@DeathInfoPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@DeathInfoPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DEATHINFOPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/DebugEndPoint.hpp b/LiteLoader/include/llapi/mc/DebugEndPoint.hpp index 3b5b42e0a6..92577e468b 100644 --- a/LiteLoader/include/llapi/mc/DebugEndPoint.hpp +++ b/LiteLoader/include/llapi/mc/DebugEndPoint.hpp @@ -30,6 +30,36 @@ class DebugEndPoint { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_DEBUGENDPOINT + /** + * @symbol ?contentAssert\@DebugEndPoint\@\@MEAAXW4LogArea\@\@W4LogLevel\@\@PEBD\@Z + */ + MCVAPI void contentAssert(enum class LogArea, enum class LogLevel, char const *); + /** + * @symbol ?flush\@DebugEndPoint\@\@UEAAXXZ + */ + MCVAPI void flush(); + /** + * @symbol ?isEnabled\@DebugEndPoint\@\@UEBA_NXZ + */ + MCVAPI bool isEnabled() const; + /** + * @symbol ?log\@DebugEndPoint\@\@UEAAXW4LogArea\@\@W4LogLevel\@\@PEBD\@Z + */ + MCVAPI void log(enum class LogArea, enum class LogLevel, char const *); + /** + * @symbol ?logOnlyOnce\@DebugEndPoint\@\@UEBA_NXZ + */ + MCVAPI bool logOnlyOnce() const; + /** + * @symbol ?setEnabled\@DebugEndPoint\@\@UEAAX_N\@Z + */ + MCVAPI void setEnabled(bool); +#endif + /** + * @symbol ??0DebugEndPoint\@\@QEAA\@V?$optional\@W4LogLevel\@\@\@std\@\@\@Z + */ + MCAPI DebugEndPoint(class std::optional); /** * @symbol ?initializeContentLogging\@DebugEndPoint\@\@QEAAXAEAVResourcePackManager\@\@AEBVPath\@Core\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/DebugInfoComponent.hpp b/LiteLoader/include/llapi/mc/DebugInfoComponent.hpp index e5abf9672e..a7c27f5ab6 100644 --- a/LiteLoader/include/llapi/mc/DebugInfoComponent.hpp +++ b/LiteLoader/include/llapi/mc/DebugInfoComponent.hpp @@ -180,11 +180,6 @@ class DebugInfoComponent { virtual void __unk_vfn_29(); /** * @vftbl 30 - * @symbol __unk_vfn_30 - */ - virtual void __unk_vfn_30(); - /** - * @vftbl 31 * @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 7dcc82140a..767742938f 100644 --- a/LiteLoader/include/llapi/mc/DebugInfoPacket.hpp +++ b/LiteLoader/include/llapi/mc/DebugInfoPacket.hpp @@ -51,9 +51,9 @@ class DebugInfoPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@DebugInfoPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@DebugInfoPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0DebugInfoPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/DecoratedPotBlock.hpp b/LiteLoader/include/llapi/mc/DecoratedPotBlock.hpp index b0ff18191b..f25895f8dc 100644 --- a/LiteLoader/include/llapi/mc/DecoratedPotBlock.hpp +++ b/LiteLoader/include/llapi/mc/DecoratedPotBlock.hpp @@ -40,16 +40,21 @@ class DecoratedPotBlock : public ActorBlock { * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class DecoratedPotBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class DecoratedPotBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,15 +131,15 @@ class DecoratedPotBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -142,121 +147,116 @@ class DecoratedPotBlock : public ActorBlock { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@DecoratedPotBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 69 + * @vftbl 68 * @symbol ?checkIsPathable\@DecoratedPotBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 101 + * @vftbl 100 * @symbol ?playerWillDestroy\@DecoratedPotBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 102 + * @vftbl 101 * @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 103 + * @vftbl 102 * @symbol ?asItemInstance\@DecoratedPotBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 + * @vftbl 103 * @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 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 195 + * @vftbl 194 * @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 92ee84e76b..f765723756 100644 --- a/LiteLoader/include/llapi/mc/DecoratedPotBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/DecoratedPotBlockActor.hpp @@ -76,17 +76,17 @@ class DecoratedPotBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); /** - * @vftbl 37 + * @vftbl 39 * @symbol ?_getUpdatePacket\@DecoratedPotBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 38 + * @vftbl 40 * @symbol ?_onUpdatePacket\@DecoratedPotBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); @@ -95,31 +95,31 @@ class DecoratedPotBlockActor : public BlockActor { */ MCAPI DecoratedPotBlockActor(class BlockPos const &); /** - * @symbol ?getShardNames\@DecoratedPotBlockActor\@\@QEBAAEBV?$array\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$03\@std\@\@XZ + * @symbol ?getSherdNames\@DecoratedPotBlockActor\@\@QEBAAEBV?$array\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$03\@std\@\@XZ */ - MCAPI class std::array const & getShardNames() const; + MCAPI class std::array const & getSherdNames() const; /** - * @symbol ?DEFAULT_SHARD_LIST\@DecoratedPotBlockActor\@\@2V?$array\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$03\@std\@\@B + * @symbol ?DEFAULT_SHERD_LIST\@DecoratedPotBlockActor\@\@2V?$array\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$03\@std\@\@B */ - MCAPI static class std::array const DEFAULT_SHARD_LIST; + MCAPI static class std::array const DEFAULT_SHERD_LIST; /** - * @symbol ?saveShardsToTag\@DecoratedPotBlockActor\@\@SAXAEAVCompoundTag\@\@AEBV?$array\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$03\@std\@\@\@Z + * @symbol ?saveSherdsToTag\@DecoratedPotBlockActor\@\@SAXAEAVCompoundTag\@\@AEBV?$array\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$03\@std\@\@\@Z */ - MCAPI static void saveShardsToTag(class CompoundTag &, class std::array const &); + MCAPI static void saveSherdsToTag(class CompoundTag &, class std::array const &); /** * @symbol ?tryGet\@DecoratedPotBlockActor\@\@SAPEAV1\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static class DecoratedPotBlockActor * tryGet(class BlockSource &, class BlockPos const &); /** - * @symbol ?tryGetShardsFromTag\@DecoratedPotBlockActor\@\@SA?AV?$optional\@V?$array\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$03\@std\@\@\@std\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?tryGetSherdsFromTag\@DecoratedPotBlockActor\@\@SA?AV?$optional\@V?$array\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$03\@std\@\@\@std\@\@AEBVCompoundTag\@\@\@Z */ - MCAPI static class std::optional> tryGetShardsFromTag(class CompoundTag const &); + MCAPI static class std::optional> tryGetSherdsFromTag(class CompoundTag const &); //protected: /** - * @symbol ?_resetShardItemNames\@DecoratedPotBlockActor\@\@IEAAXXZ + * @symbol ?_resetSherdItemNames\@DecoratedPotBlockActor\@\@IEAAXXZ */ - MCAPI void _resetShardItemNames(); + MCAPI void _resetSherdItemNames(); protected: diff --git a/LiteLoader/include/llapi/mc/DecoratedPotRecipe.hpp b/LiteLoader/include/llapi/mc/DecoratedPotRecipe.hpp index d59a446aa6..f7a289fd31 100644 --- a/LiteLoader/include/llapi/mc/DecoratedPotRecipe.hpp +++ b/LiteLoader/include/llapi/mc/DecoratedPotRecipe.hpp @@ -32,9 +32,9 @@ class DecoratedPotRecipe : public Recipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@DecoratedPotRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z + * @symbol ?assemble\@DecoratedPotRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEAVCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; + virtual std::vector const & assemble(class CraftingContainer &, class CraftingContext &) const; /** * @vftbl 2 * @symbol ?getCraftingSize\@DecoratedPotRecipe\@\@UEBAHXZ @@ -57,9 +57,9 @@ class DecoratedPotRecipe : public Recipe { virtual void __unk_vfn_5(); /** * @vftbl 6 - * @symbol ?matches\@DecoratedPotRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @symbol ?matches\@DecoratedPotRecipe\@\@UEBA_NAEBVCraftingContainer\@\@AEBVCraftingContext\@\@\@Z */ - virtual bool matches(class CraftingContainer &, class Level &) const; + virtual bool matches(class CraftingContainer const &, class CraftingContext const &) const; /** * @vftbl 7 * @symbol ?size\@DecoratedPotRecipe\@\@UEBAHXZ diff --git a/LiteLoader/include/llapi/mc/DedicatedServer.hpp b/LiteLoader/include/llapi/mc/DedicatedServer.hpp index 057fbd0f10..087a2ce781 100644 --- a/LiteLoader/include/llapi/mc/DedicatedServer.hpp +++ b/LiteLoader/include/llapi/mc/DedicatedServer.hpp @@ -88,10 +88,6 @@ enum class StartResult; MCAPI enum class DedicatedServer::StartResult start(std::string const &, class Bedrock::ActivationArguments const &); //private: - /** - * @symbol ?initializeHttp\@DedicatedServer\@\@AEAAXW4Implementation\@Http\@Bedrock\@\@\@Z - */ - MCAPI void initializeHttp(enum class Bedrock::Http::Implementation); /** * @symbol ?initializeLogging\@DedicatedServer\@\@AEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/DeepslateBlock.hpp b/LiteLoader/include/llapi/mc/DeepslateBlock.hpp index 8a8e3406b0..21add22b50 100644 --- a/LiteLoader/include/llapi/mc/DeepslateBlock.hpp +++ b/LiteLoader/include/llapi/mc/DeepslateBlock.hpp @@ -40,16 +40,21 @@ class DeepslateBlock : public RotatedPillarBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class DeepslateBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class DeepslateBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,122 +131,117 @@ class DeepslateBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 52 + * @vftbl 51 * @symbol ?canBeOriginalSurface\@DeepslateBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_53(); + /** + * @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 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 160 + * @vftbl 158 * @symbol ?tryGetInfested\@DeepslateBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetInfested(class Block const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@DeepslateBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @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 7ed2f5876d..9ef15763d7 100644 --- a/LiteLoader/include/llapi/mc/DeepslateOreBlock.hpp +++ b/LiteLoader/include/llapi/mc/DeepslateOreBlock.hpp @@ -40,16 +40,21 @@ class DeepslateOreBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class DeepslateOreBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class DeepslateOreBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,122 +131,117 @@ class DeepslateOreBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 52 + * @vftbl 51 * @symbol ?canBeOriginalSurface\@DeepslateOreBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_53(); + /** + * @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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 102 + * @vftbl 101 * @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 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_169(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_173(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_177(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 - */ - virtual void __unk_vfn_187(); - /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@DeepslateOreBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @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 6c3faac91c..2b5e8d71eb 100644 --- a/LiteLoader/include/llapi/mc/DeepslateRedStoneOreBlock.hpp +++ b/LiteLoader/include/llapi/mc/DeepslateRedStoneOreBlock.hpp @@ -40,16 +40,21 @@ class DeepslateRedStoneOreBlock : public RedStoneOreBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class DeepslateRedStoneOreBlock : public RedStoneOreBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class DeepslateRedStoneOreBlock : public RedStoneOreBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,122 +131,117 @@ class DeepslateRedStoneOreBlock : public RedStoneOreBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@DeepslateRedStoneOreBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@DeepslateRedStoneOreBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@DeepslateRedStoneOreBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 195 + * @vftbl 194 * @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 45bd2483d8..9396ee2686 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?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 ?loadDirection\@DefaultDataLoadHelper\@\@UEAA?AVVec3\@\@AEBV2\@\@Z + */ + MCVAPI class Vec3 loadDirection(class Vec3 const &); /** * @symbol ?loadFacingID\@DefaultDataLoadHelper\@\@UEAAEE\@Z */ diff --git a/LiteLoader/include/llapi/mc/DeferredScriptCommand.hpp b/LiteLoader/include/llapi/mc/DeferredScriptCommand.hpp index 079d495dd2..b729dfd2e8 100644 --- a/LiteLoader/include/llapi/mc/DeferredScriptCommand.hpp +++ b/LiteLoader/include/llapi/mc/DeferredScriptCommand.hpp @@ -41,8 +41,8 @@ class DeferredScriptCommand : public Command { */ virtual void execute(class MinecraftCommands &); /** - * @symbol ??0DeferredScriptCommand\@\@QEAA\@V?$unique_ptr\@VScriptCommand\@\@U?$default_delete\@VScriptCommand\@\@\@std\@\@\@std\@\@V?$unique_ptr\@VCommandContext\@\@U?$default_delete\@VCommandContext\@\@\@std\@\@\@2\@VWeakLifetimeScope\@Scripting\@\@V?$Promise\@V?$StrongTypedObjectHandle\@UScriptCommandResult\@ScriptModuleMinecraft\@\@\@Scripting\@\@UError\@2\@X\@5\@\@Z + * @symbol ??0DeferredScriptCommand\@\@QEAA\@V?$unique_ptr\@VScriptCommand\@\@U?$default_delete\@VScriptCommand\@\@\@std\@\@\@std\@\@V?$unique_ptr\@VCommandContext\@\@U?$default_delete\@VCommandContext\@\@\@std\@\@\@2\@VWeakLifetimeScope\@Scripting\@\@V?$Promise\@V?$StrongTypedObjectHandle\@UScriptCommandResult\@ScriptModuleMinecraft\@\@\@Scripting\@\@UScriptCommandError\@ScriptModuleMinecraft\@\@X\@5\@\@Z */ - MCAPI DeferredScriptCommand(std::unique_ptr, std::unique_ptr, class Scripting::WeakLifetimeScope, class Scripting::Promise, struct Scripting::Error, void>); + MCAPI DeferredScriptCommand(std::unique_ptr, std::unique_ptr, class Scripting::WeakLifetimeScope, class Scripting::Promise, struct ScriptModuleMinecraft::ScriptCommandError, void>); }; diff --git a/LiteLoader/include/llapi/mc/DeprecatedSlabBlockItem.hpp b/LiteLoader/include/llapi/mc/DeprecatedSlabBlockItem.hpp index baffbf1b8e..af6da66c3c 100644 --- a/LiteLoader/include/llapi/mc/DeprecatedSlabBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/DeprecatedSlabBlockItem.hpp @@ -36,11 +36,6 @@ class DeprecatedSlabBlockItem : public BlockItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class DeprecatedSlabBlockItem : public BlockItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -102,12 +102,22 @@ class DeprecatedSlabBlockItem : public BlockItem { */ virtual void __unk_vfn_80(); /** - * @vftbl 131 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 133 * @symbol ?_calculatePlacePos\@DeprecatedSlabBlockItem\@\@UEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 132 + * @vftbl 134 * @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/DetectorRailBlock.hpp b/LiteLoader/include/llapi/mc/DetectorRailBlock.hpp index bba3af84ed..5e9c5448ff 100644 --- a/LiteLoader/include/llapi/mc/DetectorRailBlock.hpp +++ b/LiteLoader/include/llapi/mc/DetectorRailBlock.hpp @@ -40,16 +40,21 @@ class DetectorRailBlock : public BaseRailBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class DetectorRailBlock : public BaseRailBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class DetectorRailBlock : public BaseRailBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,145 +131,140 @@ class DetectorRailBlock : public BaseRailBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 51 + * @vftbl 50 * @symbol ?isSignalSource\@DetectorRailBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 64 + * @vftbl 63 * @symbol ?shouldConnectToRedstone\@DetectorRailBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 73 + * @vftbl 72 * @symbol ?onRedstoneUpdate\@DetectorRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@DetectorRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 113 + * @vftbl 112 * @symbol ?entityInside\@DetectorRailBlock\@\@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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 127 + * @vftbl 125 * @symbol ?getComparatorSignal\@DetectorRailBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@DetectorRailBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@DetectorRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DETECTORRAILBLOCK /** * @symbol ?hasComparatorSignal\@DetectorRailBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/DiggerItem.hpp b/LiteLoader/include/llapi/mc/DiggerItem.hpp index 714dca72e6..5d1c1d60d1 100644 --- a/LiteLoader/include/llapi/mc/DiggerItem.hpp +++ b/LiteLoader/include/llapi/mc/DiggerItem.hpp @@ -36,11 +36,6 @@ class DiggerItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class DiggerItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 48 * @symbol ?getAttackDamage\@DiggerItem\@\@UEBAHXZ @@ -136,6 +136,16 @@ class DiggerItem : public Item { * @symbol ?mineBlock\@DiggerItem\@\@UEBA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z */ virtual bool mineBlock(class ItemStack &, class Block const &, int, int, int, class Actor *) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DIGGERITEM /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/DiggerItemComponent.hpp b/LiteLoader/include/llapi/mc/DiggerItemComponent.hpp index 49f4012954..1143333cb4 100644 --- a/LiteLoader/include/llapi/mc/DiggerItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/DiggerItemComponent.hpp @@ -51,16 +51,11 @@ class DiggerItemComponent { virtual void __unk_vfn_3(); /** * @vftbl 4 - * @symbol __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 * @symbol ?buildNetworkTag\@?$NetworkedItemComponent\@VDiggerItemComponent\@\@\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 5 * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VDiggerItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/Dimension.hpp b/LiteLoader/include/llapi/mc/Dimension.hpp index 184026761d..731f18d945 100644 --- a/LiteLoader/include/llapi/mc/Dimension.hpp +++ b/LiteLoader/include/llapi/mc/Dimension.hpp @@ -43,6 +43,10 @@ class Dimension { * @symbol ?deserialize\@Dimension\@\@UEAAXAEBVCompoundTag\@\@\@Z */ MCVAPI void deserialize(class CompoundTag const &); + /** + * @symbol ?flushLevelChunkGarbageCollector\@Dimension\@\@UEAAXXZ + */ + MCVAPI void flushLevelChunkGarbageCollector(); /** * @symbol ?forceCheckAllNeighChunkSavedStat\@Dimension\@\@UEBA_NXZ */ @@ -216,22 +220,22 @@ class Dimension { * @symbol ?fetchEntity\@Dimension\@\@QEBAPEAVActor\@\@UActorUniqueID\@\@_N\@Z */ MCAPI class Actor * fetchEntity(struct ActorUniqueID, bool) const; - /** - * @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\@\@AEAVActor\@\@M\@Z + * @symbol ?fetchNearestAttackablePlayer\@Dimension\@\@QEAAPEAVPlayer\@\@VBlockPos\@\@MPEAVActor\@\@\@Z */ - MCAPI class Player * fetchNearestInteractablePlayer(class Actor &, float) const; + MCAPI class Player * fetchNearestAttackablePlayer(class BlockPos, float, class Actor *); /** * @symbol ?fetchNearestInteractablePlayer\@Dimension\@\@QEBAPEAVPlayer\@\@AEBVVec3\@\@M\@Z */ MCAPI class Player * fetchNearestInteractablePlayer(class Vec3 const &, float) const; + /** + * @symbol ?fetchNearestInteractablePlayer\@Dimension\@\@QEBAPEAVPlayer\@\@AEAVActor\@\@M\@Z + */ + MCAPI class Player * fetchNearestInteractablePlayer(class Actor &, float) const; /** * @symbol ?fetchNearestPlayer\@Dimension\@\@QEBAPEAVPlayer\@\@AEBVVec3\@\@M_NV?$function\@$$A6A_NAEBVPlayer\@\@\@Z\@std\@\@\@Z */ @@ -244,10 +248,6 @@ class Dimension { * @symbol ?flagEntityforChunkMove\@Dimension\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void flagEntityforChunkMove(class Actor &); - /** - * @symbol ?flushLevelChunkGarbageCollector\@Dimension\@\@QEAAXXZ - */ - MCAPI void flushLevelChunkGarbageCollector(); /** * @symbol ?flushRunTimeLighting\@Dimension\@\@QEAAXXZ */ @@ -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\@\@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 ?transferEntityToUnloadedChunk\@Dimension\@\@QEAAXAEAVActor\@\@PEAVLevelChunk\@\@\@Z + */ + MCAPI void transferEntityToUnloadedChunk(class Actor &, class LevelChunk *); /** * @symbol ?tryGarbageCollectStructures\@Dimension\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/DimensionDataPacket.hpp b/LiteLoader/include/llapi/mc/DimensionDataPacket.hpp index 44457b3aab..3ab9a1571c 100644 --- a/LiteLoader/include/llapi/mc/DimensionDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/DimensionDataPacket.hpp @@ -50,9 +50,9 @@ class DimensionDataPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@DimensionDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@DimensionDataPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DIMENSIONDATAPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/DimensionDefinitionGroup.hpp b/LiteLoader/include/llapi/mc/DimensionDefinitionGroup.hpp index a3a8ec2d4a..8be2637147 100644 --- a/LiteLoader/include/llapi/mc/DimensionDefinitionGroup.hpp +++ b/LiteLoader/include/llapi/mc/DimensionDefinitionGroup.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "DimensionDocument.hpp" #define BEFORE_EXTRA @@ -49,4 +50,12 @@ class DimensionDefinitionGroup { */ MCAPI ~DimensionDefinitionGroup(); +//private: + /** + * @symbol ?_checkValidDimensionBounds\@DimensionDefinitionGroup\@\@AEAA_NAEBUDimension\@DimensionDocument\@\@\@Z + */ + MCAPI bool _checkValidDimensionBounds(struct DimensionDocument::Dimension const &); + +private: + }; diff --git a/LiteLoader/include/llapi/mc/DimensionDocument.hpp b/LiteLoader/include/llapi/mc/DimensionDocument.hpp index 06293ee511..d8331bd7b3 100644 --- a/LiteLoader/include/llapi/mc/DimensionDocument.hpp +++ b/LiteLoader/include/llapi/mc/DimensionDocument.hpp @@ -18,6 +18,8 @@ struct DimensionDocument { #define AFTER_EXTRA + struct Dimension; + #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_DIMENSIONDOCUMENT public: diff --git a/LiteLoader/include/llapi/mc/DimensionManager.hpp b/LiteLoader/include/llapi/mc/DimensionManager.hpp index e2a1be5275..1e36b2c79c 100644 --- a/LiteLoader/include/llapi/mc/DimensionManager.hpp +++ b/LiteLoader/include/llapi/mc/DimensionManager.hpp @@ -26,6 +26,12 @@ class DimensionManager { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_DIMENSIONMANAGER + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~DimensionManager(); +#endif /** * @symbol ??0DimensionManager\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VIDimensionFactory\@\@\@Bedrock\@\@\@gsl\@\@V?$optional\@VDimensionDefinitionGroup\@\@\@std\@\@\@Z */ @@ -74,9 +80,5 @@ class DimensionManager { * @symbol ?shutdown\@DimensionManager\@\@QEAAXXZ */ MCAPI void shutdown(); - /** - * @symbol ??1DimensionManager\@\@QEAA\@XZ - */ - MCAPI ~DimensionManager(); }; diff --git a/LiteLoader/include/llapi/mc/DiodeBlock.hpp b/LiteLoader/include/llapi/mc/DiodeBlock.hpp index 702b3a4c34..21fcc524cd 100644 --- a/LiteLoader/include/llapi/mc/DiodeBlock.hpp +++ b/LiteLoader/include/llapi/mc/DiodeBlock.hpp @@ -40,16 +40,21 @@ class DiodeBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class DiodeBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class DiodeBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,212 +131,207 @@ class DiodeBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 51 + * @vftbl 50 * @symbol ?isSignalSource\@DiodeBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_53(); /** - * @vftbl 59 + * @vftbl 58 * @symbol ?getDirectSignal\@DiodeBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual int getDirectSignal(class BlockSource &, class BlockPos const &, int) const; + /** + * @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 73 + * @vftbl 72 * @symbol ?onRedstoneUpdate\@DiodeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@DiodeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@DiodeBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 148 + * @vftbl 146 * @symbol ?canSpawnOn\@DiodeBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@DiodeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 195 + * @vftbl 194 * @symbol ?getSignal\@DiodeBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual int getSignal(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 196 + * @vftbl 195 * @symbol ?isLocked\@DiodeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isLocked(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 197 + * @vftbl 196 * @symbol ?isSameDiode\@DiodeBlock\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool isSameDiode(class Block const &) const; /** - * @vftbl 198 + * @vftbl 197 * @symbol ?shouldPrioritize\@DiodeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool shouldPrioritize(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 199 + * @vftbl 198 * @symbol ?isOn\@DiodeBlock\@\@MEBA_NXZ */ virtual bool isOn() const; /** - * @vftbl 200 + * @vftbl 199 * @symbol ?shouldTurnOn\@DiodeBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool shouldTurnOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 201 + * @vftbl 200 * @symbol ?getInputSignal\@DiodeBlock\@\@MEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getInputSignal(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 202 + * @vftbl 201 * @symbol ?isAlternateInput\@DiodeBlock\@\@MEBA_NAEBVBlock\@\@\@Z */ virtual bool isAlternateInput(class Block const &) const; /** - * @vftbl 203 + * @vftbl 202 * @symbol ?getAlternateSignal\@DiodeBlock\@\@MEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getAlternateSignal(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 204 + * @vftbl 203 * @symbol ?getOutputSignal\@DiodeBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int getOutputSignal(class Block const &) const; /** - * @vftbl 205 + * @vftbl 204 * @symbol ?getTurnOffDelay\@DiodeBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int getTurnOffDelay(class Block const &) const; /** - * @vftbl 206 + * @vftbl 205 * @symbol ?getTurnOnDelay\@RepeaterBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int getTurnOnDelay(class Block const &) const = 0; /** - * @vftbl 207 + * @vftbl 206 * @symbol ?getOnBlock\@RepeaterBlock\@\@MEBAPEBVBlock\@\@PEBV2\@\@Z */ virtual class Block const * getOnBlock(class Block const *) const = 0; /** - * @vftbl 208 + * @vftbl 207 * @symbol ?getOffBlock\@RepeaterBlock\@\@MEBAPEBVBlock\@\@PEBV2\@\@Z */ virtual class Block const * getOffBlock(class Block const *) const = 0; diff --git a/LiteLoader/include/llapi/mc/DirectPlayerMovementProxy.hpp b/LiteLoader/include/llapi/mc/DirectPlayerMovementProxy.hpp index a190a00464..5f9c505867 100644 --- a/LiteLoader/include/llapi/mc/DirectPlayerMovementProxy.hpp +++ b/LiteLoader/include/llapi/mc/DirectPlayerMovementProxy.hpp @@ -98,10 +98,6 @@ class DirectPlayerMovementProxy { * @symbol ?getGlidingTicks\@DirectPlayerMovementProxy\@\@UEBAHXZ */ MCVAPI int getGlidingTicks() const; - /** - * @symbol ?getInputMode\@DirectPlayerMovementProxy\@\@UEBA?AW4InputMode\@\@XZ - */ - MCVAPI enum class InputMode getInputMode() const; /** * @symbol ?getItemUseMovementModifier\@DirectPlayerMovementProxy\@\@UEBAMXZ */ @@ -126,14 +122,6 @@ class DirectPlayerMovementProxy { * @symbol ?getLoadingState\@DirectPlayerMovementProxy\@\@UEBA?AW4LoadingState\@\@XZ */ MCVAPI enum class LoadingState getLoadingState() const; - /** - * @symbol ?getMoveInputHandler\@DirectPlayerMovementProxy\@\@UEAAPEAVMoveInputHandler\@\@XZ - */ - MCVAPI class MoveInputHandler * getMoveInputHandler(); - /** - * @symbol ?getPlayMode\@DirectPlayerMovementProxy\@\@UEBA?AW4ClientPlayMode\@\@XZ - */ - MCVAPI enum class ClientPlayMode getPlayMode() const; /** * @symbol ?getPlayerPaddleForce\@DirectPlayerMovementProxy\@\@UEBAMW4Side\@\@\@Z */ @@ -146,10 +134,6 @@ class DirectPlayerMovementProxy { * @symbol ?getVRMoveAdjustAngle\@DirectPlayerMovementProxy\@\@UEBAMXZ */ MCVAPI float getVRMoveAdjustAngle() const; - /** - * @symbol ?isAdventureSettingsAutoJump\@DirectPlayerMovementProxy\@\@UEAA_NXZ - */ - MCVAPI bool isAdventureSettingsAutoJump(); /** * @symbol ?isArmorFlyEnabled\@DirectPlayerMovementProxy\@\@UEBA_NXZ */ @@ -298,14 +282,14 @@ class DirectPlayerMovementProxy { * @symbol ?stopGliding\@DirectPlayerMovementProxy\@\@UEAAXXZ */ MCVAPI void stopGliding(); - /** - * @symbol ?tryAsPlayer\@DirectPlayerMovementProxy\@\@UEAAPEAUIPlayerMovementProxy\@\@XZ - */ - MCVAPI struct IPlayerMovementProxy * tryAsPlayer(); /** * @symbol ?tryAsPlayer\@DirectPlayerMovementProxy\@\@UEBAPEBUIPlayerMovementProxy\@\@XZ */ MCVAPI struct IPlayerMovementProxy const * tryAsPlayer() const; + /** + * @symbol ?tryAsPlayer\@DirectPlayerMovementProxy\@\@UEAAPEAUIPlayerMovementProxy\@\@XZ + */ + MCVAPI struct IPlayerMovementProxy * tryAsPlayer(); /** * @symbol ?tryGetPlayerActionComponent\@DirectPlayerMovementProxy\@\@UEAAPEAUPlayerActionComponent\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/Direction.hpp b/LiteLoader/include/llapi/mc/Direction.hpp index ee9e82ea9a..ffebdebc86 100644 --- a/LiteLoader/include/llapi/mc/Direction.hpp +++ b/LiteLoader/include/llapi/mc/Direction.hpp @@ -51,6 +51,10 @@ enum class Type; * @symbol ?FACING_DIRECTION\@Direction\@\@2QBW4Type\@1\@B */ MCAPI static enum class Direction::Type const FACING_DIRECTION[]; + /** + * @symbol ?FROM_STRING_MAP\@Direction\@\@2V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Type\@Direction\@\@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\@\@W4Type\@Direction\@\@\@std\@\@\@2\@\@std\@\@B + */ + MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> const FROM_STRING_MAP; /** * @symbol ?STEP_X\@Direction\@\@2QBHB */ @@ -59,6 +63,10 @@ enum class Type; * @symbol ?STEP_Z\@Direction\@\@2QBHB */ MCAPI static int const STEP_Z[]; + /** + * @symbol ?TO_STRING_MAP\@Direction\@\@2V?$unordered_map\@IV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@I\@2\@U?$equal_to\@I\@2\@V?$allocator\@U?$pair\@$$CBIV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@B + */ + MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> const TO_STRING_MAP; /** * @symbol ?convertFacingDirectionToDirection\@Direction\@\@SA?AW4Type\@1\@E\@Z */ diff --git a/LiteLoader/include/llapi/mc/DirtBlock.hpp b/LiteLoader/include/llapi/mc/DirtBlock.hpp index f04a56d47a..9fd8c60c44 100644 --- a/LiteLoader/include/llapi/mc/DirtBlock.hpp +++ b/LiteLoader/include/llapi/mc/DirtBlock.hpp @@ -40,16 +40,21 @@ class DirtBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class DirtBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class DirtBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,177 +131,172 @@ class DirtBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 52 + * @vftbl 51 * @symbol ?canBeOriginalSurface\@DirtBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_53(); /** - * @vftbl 55 + * @vftbl 54 * @symbol ?isValidAuxValue\@DirtBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; + /** + * @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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@DirtBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 86 * @symbol ?mayConsumeFertilizer\@DirtBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@DirtBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 95 + * @vftbl 94 * @symbol ?tryToTill\@DirtBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@AEAVItemStack\@\@\@Z */ virtual bool tryToTill(class BlockSource &, class BlockPos const &, class Actor &, class ItemStack &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@DirtBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@DirtBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@DirtBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 162 + * @vftbl 160 * @symbol ?_addHardCodedBlockComponents\@DirtBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@DirtBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 186 + * @vftbl 185 * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@DirtBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@DirtBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/GrassPathBlock.hpp b/LiteLoader/include/llapi/mc/DirtPathBlock.hpp similarity index 50% rename from LiteLoader/include/llapi/mc/GrassPathBlock.hpp rename to LiteLoader/include/llapi/mc/DirtPathBlock.hpp index c1cff29db6..f94a47e8b5 100644 --- a/LiteLoader/include/llapi/mc/GrassPathBlock.hpp +++ b/LiteLoader/include/llapi/mc/DirtPathBlock.hpp @@ -1,5 +1,5 @@ /** - * @file GrassPathBlock.hpp + * @file DirtPathBlock.hpp * */ #pragma once @@ -8,25 +8,20 @@ #include "BlockLegacy.hpp" #define BEFORE_EXTRA -// Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC class GrassPathBlock. - * - */ -class GrassPathBlock : public BlockLegacy { + +class DirtPathBlock : public BlockLegacy { #define AFTER_EXTRA -// Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_GRASSPATHBLOCK +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_DIRTPATHBLOCK public: - class GrassPathBlock& operator=(class GrassPathBlock const &) = delete; - GrassPathBlock(class GrassPathBlock const &) = delete; - GrassPathBlock() = delete; + class DirtPathBlock& operator=(class DirtPathBlock const &) = delete; + DirtPathBlock(class DirtPathBlock const &) = delete; + DirtPathBlock() = delete; #endif public: @@ -37,7 +32,7 @@ class GrassPathBlock : public BlockLegacy { virtual void __unk_vfn_0(); /** * @vftbl 10 - * @symbol ?getAABB\@GrassPathBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @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; /** @@ -45,16 +40,26 @@ class GrassPathBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); + /** + * @vftbl 22 + * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class GrassPathBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class GrassPathBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,20 +136,20 @@ class GrassPathBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 51 + * @symbol ?canBeOriginalSurface\@DirtPathBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_49(); + virtual bool canBeOriginalSurface() const; /** - * @vftbl 52 - * @symbol ?canBeOriginalSurface\@GrassPathBlock\@\@UEBA_NXZ + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual bool canBeOriginalSurface() const; + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -152,130 +157,125 @@ class GrassPathBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 - * @symbol ?canContainLiquid\@GrassPathBlock\@\@UEBA_NXZ + * @symbol ?canContainLiquid\@DirtPathBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 95 - * @symbol ?tryToTill\@GrassPathBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@AEAVItemStack\@\@\@Z + * @vftbl 94 + * @symbol ?tryToTill\@DirtPathBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@AEAVItemStack\@\@\@Z */ virtual bool tryToTill(class BlockSource &, class BlockPos const &, class Actor &, class ItemStack &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@GrassPathBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 98 + * @symbol ?neighborChanged\@DirtPathBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + 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 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_169(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 - */ - virtual void __unk_vfn_168(); - /** - * @vftbl 171 - * @symbol __unk_vfn_171 - */ - virtual void __unk_vfn_171(); - /** - * @vftbl 172 - * @symbol ?tick\@GrassPathBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 170 + * @symbol ?tick\@DirtPathBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 - * @symbol ?use\@GrassPathBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 176 + * @symbol ?use\@DirtPathBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 - * @symbol ?canSurvive\@GrassPathBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol ?canSurvive\@DirtPathBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 - * @symbol ?getResourceItem\@GrassPathBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@DirtPathBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @symbol ??0GrassPathBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0DirtPathBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ - MCAPI GrassPathBlock(std::string const &, int); + MCAPI DirtPathBlock(std::string const &, int); /** - * @symbol ?BLOCK_AABB\@GrassPathBlock\@\@2VAABB\@\@A + * @symbol ?BLOCK_AABB\@DirtPathBlock\@\@2VAABB\@\@A */ MCAPI static class AABB BLOCK_AABB; diff --git a/LiteLoader/include/llapi/mc/DiscFragmentItem.hpp b/LiteLoader/include/llapi/mc/DiscFragmentItem.hpp index 4a31cf8dc2..80a3ae7a7a 100644 --- a/LiteLoader/include/llapi/mc/DiscFragmentItem.hpp +++ b/LiteLoader/include/llapi/mc/DiscFragmentItem.hpp @@ -34,11 +34,6 @@ class DiscFragmentItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -54,6 +49,11 @@ class DiscFragmentItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -109,6 +109,16 @@ class DiscFragmentItem : public Item { * @symbol ?buildDescriptionId\@DiscFragmentItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); /** * @symbol ??0DiscFragmentItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/DisconnectPacket.hpp b/LiteLoader/include/llapi/mc/DisconnectPacket.hpp index cb7ebe6405..3dca279029 100644 --- a/LiteLoader/include/llapi/mc/DisconnectPacket.hpp +++ b/LiteLoader/include/llapi/mc/DisconnectPacket.hpp @@ -51,9 +51,9 @@ class DisconnectPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@DisconnectPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@DisconnectPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 ccaa0bd710..193ffcd872 100644 --- a/LiteLoader/include/llapi/mc/DispenserBlock.hpp +++ b/LiteLoader/include/llapi/mc/DispenserBlock.hpp @@ -40,16 +40,21 @@ class DispenserBlock : public ActorBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class DispenserBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class DispenserBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,172 +131,167 @@ class DispenserBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 73 + * @vftbl 72 * @symbol ?onRedstoneUpdate\@DispenserBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@DispenserBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 127 + * @vftbl 125 * @symbol ?getComparatorSignal\@DispenserBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@DispenserBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?getMappedFace\@DispenserBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@DispenserBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@DispenserBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@DispenserBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@DispenserBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@DispenserBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@DispenserBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 196 + * @vftbl 195 * @symbol ?getTickDelay\@DispenserBlock\@\@UEBAHXZ */ virtual int getTickDelay() const; /** - * @vftbl 197 + * @vftbl 196 * @symbol ?dispenseFrom\@DispenserBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void dispenseFrom(class BlockSource &, class BlockPos const &) const; @@ -314,15 +314,15 @@ class DispenserBlock : public ActorBlock { */ MCAPI DispenserBlock(std::string const &, int); /** - * @symbol ?ejectItem\@DispenserBlock\@\@SAXAEAVBlockSource\@\@AEBVVec3\@\@EAEBVItemStack\@\@\@Z + * @symbol ?ejectItem\@DispenserBlock\@\@SAXAEAVBlockSource\@\@AEBVVec3\@\@EAEBVItemStack\@\@H\@Z */ - MCAPI static void ejectItem(class BlockSource &, class Vec3 const &, unsigned char, class ItemStack const &); + MCAPI static void ejectItem(class BlockSource &, class Vec3 const &, unsigned char, class ItemStack const &, int); //protected: /** - * @symbol ?ejectItem\@DispenserBlock\@\@IEBAXAEAVBlockSource\@\@AEBVVec3\@\@EAEBVItemStack\@\@AEAVContainer\@\@H\@Z + * @symbol ?ejectItem\@DispenserBlock\@\@IEBAXAEAVBlockSource\@\@AEBVVec3\@\@EAEBVItemStack\@\@AEAVContainer\@\@HH\@Z */ - MCAPI void ejectItem(class BlockSource &, class Vec3 const &, unsigned char, class ItemStack const &, class Container &, int) const; + MCAPI void ejectItem(class BlockSource &, class Vec3 const &, unsigned char, class ItemStack const &, class Container &, int, int) const; /** * @symbol ?getDispensePosition\@DispenserBlock\@\@IEBA?AVVec3\@\@AEAVBlockSource\@\@AEBV2\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/DispenserBlockActor.hpp b/LiteLoader/include/llapi/mc/DispenserBlockActor.hpp index 90fc331955..f59614cc78 100644 --- a/LiteLoader/include/llapi/mc/DispenserBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/DispenserBlockActor.hpp @@ -62,10 +62,6 @@ class DispenserBlockActor { * @symbol ?getName\@DispenserBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getName() const; - /** - * @symbol ?getRandomSlot\@DispenserBlockActor\@\@UEAAHXZ - */ - MCVAPI int getRandomSlot(); /** * @symbol ?load\@DispenserBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ @@ -94,15 +90,15 @@ class DispenserBlockActor { * @symbol ?stopOpen\@DispenserBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void stopOpen(class Player &); - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~DispenserBlockActor(); #endif /** * @symbol ??0DispenserBlockActor\@\@QEAA\@VBlockPos\@\@W4BlockActorType\@\@\@Z */ MCAPI DispenserBlockActor(class BlockPos, enum class BlockActorType); + /** + * @symbol ?getRandomSlot\@DispenserBlockActor\@\@QEAAHAEAVRandom\@\@\@Z + */ + MCAPI int getRandomSlot(class Random &); //protected: /** diff --git a/LiteLoader/include/llapi/mc/DisplayNameItemComponent.hpp b/LiteLoader/include/llapi/mc/DisplayNameItemComponent.hpp index 78b07e4b58..ac90358b22 100644 --- a/LiteLoader/include/llapi/mc/DisplayNameItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/DisplayNameItemComponent.hpp @@ -51,19 +51,26 @@ class DisplayNameItemComponent { virtual void __unk_vfn_3(); /** * @vftbl 4 - * @symbol __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 * @symbol ?buildNetworkTag\@?$NetworkedItemComponent\@VDisplayNameItemComponent\@\@\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 5 * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VDisplayNameItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); + /** + * @symbol ??0DisplayNameItemComponent\@\@QEAA\@PEAVComponentItem\@\@\@Z + */ + MCAPI DisplayNameItemComponent(class ComponentItem *); + /** + * @symbol ?getDescriptionId\@DisplayNameItemComponent\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + */ + MCAPI std::string const & getDescriptionId() const; + /** + * @symbol ?setDescriptionId\@DisplayNameItemComponent\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI void setDescriptionId(std::string const &); /** * @symbol ?bindType\@DisplayNameItemComponent\@\@SAXXZ */ diff --git a/LiteLoader/include/llapi/mc/Dolphin.hpp b/LiteLoader/include/llapi/mc/Dolphin.hpp index 468c347535..ea90036c22 100644 --- a/LiteLoader/include/llapi/mc/Dolphin.hpp +++ b/LiteLoader/include/llapi/mc/Dolphin.hpp @@ -42,145 +42,140 @@ class Dolphin : public WaterAnimal { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 188 + * @symbol ?canBePulledIntoVehicle\@Dolphin\@\@UEBA_NXZ */ - virtual void __unk_vfn_178(); + virtual bool canBePulledIntoVehicle() const; /** * @vftbl 190 - * @symbol ?canBePulledIntoVehicle\@Dolphin\@\@UEBA_NXZ + * @symbol __unk_vfn_190 */ - virtual bool canBePulledIntoVehicle() const; + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); - /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 288 + * @vftbl 280 * @symbol ?aiStep\@Dolphin\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 331 + * @vftbl 323 * @symbol ?createAIGoals\@Dolphin\@\@UEAA_NXZ */ virtual bool createAIGoals(); /** - * @vftbl 337 + * @vftbl 329 * @symbol ?_getWalkTargetValue\@Dolphin\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0Dolphin\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/DoorBlock.hpp b/LiteLoader/include/llapi/mc/DoorBlock.hpp index 0c35f45d55..3562892641 100644 --- a/LiteLoader/include/llapi/mc/DoorBlock.hpp +++ b/LiteLoader/include/llapi/mc/DoorBlock.hpp @@ -56,16 +56,21 @@ class DoorBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -77,10 +82,10 @@ class DoorBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -112,10 +117,10 @@ class DoorBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -142,197 +147,192 @@ class DoorBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_53(); /** - * @vftbl 56 + * @vftbl 55 * @symbol ?canFillAtPos\@DoorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canFillAtPos(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 58 + * @vftbl 57 * @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 + */ + 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 69 + * @vftbl 68 * @symbol ?checkIsPathable\@DoorBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 73 + * @vftbl 72 * @symbol ?onRedstoneUpdate\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@DoorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 100 + * @vftbl 99 * @symbol ?getSecondPart\@DoorBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool getSecondPart(class BlockSource const &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@DoorBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 113 + * @vftbl 112 * @symbol ?entityInside\@DoorBlock\@\@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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 143 + * @vftbl 141 * @symbol ?getVisualShapeInWorld\@DoorBlock\@\@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 147 + * @vftbl 145 * @symbol ?getVariant\@DoorBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@DoorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@DoorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@DoorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@DoorBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@DoorBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/DoorItem.hpp b/LiteLoader/include/llapi/mc/DoorItem.hpp index 55f46262d1..63321ff6e7 100644 --- a/LiteLoader/include/llapi/mc/DoorItem.hpp +++ b/LiteLoader/include/llapi/mc/DoorItem.hpp @@ -37,11 +37,6 @@ class DoorItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -57,6 +52,11 @@ class DoorItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -103,7 +103,17 @@ class DoorItem : public Item { */ virtual void __unk_vfn_80(); /** - * @vftbl 132 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 134 * @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 7934b1444e..f657ec9fe0 100644 --- a/LiteLoader/include/llapi/mc/DoublePlantBaseBlock.hpp +++ b/LiteLoader/include/llapi/mc/DoublePlantBaseBlock.hpp @@ -55,16 +55,21 @@ class DoublePlantBaseBlock : public BushBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -76,10 +81,10 @@ class DoublePlantBaseBlock : public BushBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -111,10 +116,10 @@ class DoublePlantBaseBlock : public BushBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -141,15 +146,15 @@ class DoublePlantBaseBlock : public BushBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -157,156 +162,151 @@ class DoublePlantBaseBlock : public BushBlock { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@DoublePlantBaseBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@DoublePlantBaseBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@DoublePlantBaseBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 91 + * @vftbl 90 * @symbol ?mayPlace\@DoublePlantBaseBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@DoublePlantBaseBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 100 + * @vftbl 99 * @symbol ?getSecondPart\@DoublePlantBaseBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool getSecondPart(class BlockSource const &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 101 + * @vftbl 100 * @symbol ?playerWillDestroy\@DoublePlantBaseBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 102 + * @vftbl 101 * @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 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@DoublePlantBaseBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@DoublePlantBaseBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@DoublePlantBaseBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@DoublePlantBaseBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@DoublePlantBaseBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 195 + * @vftbl 194 * @symbol ?checkAlive\@DoublePlantBaseBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void checkAlive(class BlockSource &, class BlockPos const &) const; diff --git a/LiteLoader/include/llapi/mc/DoublePlantBlock.hpp b/LiteLoader/include/llapi/mc/DoublePlantBlock.hpp index c2cfd4eab7..db7a21519d 100644 --- a/LiteLoader/include/llapi/mc/DoublePlantBlock.hpp +++ b/LiteLoader/include/llapi/mc/DoublePlantBlock.hpp @@ -40,16 +40,21 @@ class DoublePlantBlock : public DoublePlantBaseBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class DoublePlantBlock : public DoublePlantBaseBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class DoublePlantBlock : public DoublePlantBaseBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,172 +131,167 @@ class DoublePlantBlock : public DoublePlantBaseBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@DoublePlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@DoublePlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@DoublePlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@DoublePlantBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 115 + * @vftbl 114 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@DoublePlantBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 137 + * @vftbl 135 * @symbol ?getColor\@DoublePlantBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 139 + * @vftbl 137 * @symbol ?getColorForParticle\@DoublePlantBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColorForParticle(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@DoublePlantBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 181 + * @vftbl 179 * @symbol ?getRenderLayer\@DoublePlantBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 182 + * @vftbl 180 * @symbol ?getRenderLayer\@DoublePlantBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 + * @vftbl 187 * @symbol ?playerDestroy\@DoublePlantBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@DoublePlantBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/DoubleTag.hpp b/LiteLoader/include/llapi/mc/DoubleTag.hpp index 6f8dc6f106..2b20eaecbe 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 ?write\@DoubleTag\@\@UEBAXAEAVIDataOutput\@\@\@Z + * @symbol __unk_vfn_2 */ - virtual void write(class IDataOutput &) const; + virtual void __unk_vfn_2(); /** * @vftbl 3 * @symbol ?load\@DoubleTag\@\@UEAAXAEAVIDataInput\@\@\@Z @@ -79,5 +79,11 @@ 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 ac0fc3e9c9..55ccf857e3 100644 --- a/LiteLoader/include/llapi/mc/DragonEggBlock.hpp +++ b/LiteLoader/include/llapi/mc/DragonEggBlock.hpp @@ -5,7 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "HeavyBlock.hpp" +#include "FallingBlock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +16,7 @@ * @brief MC class DragonEggBlock. * */ -class DragonEggBlock : public HeavyBlock { +class DragonEggBlock : public FallingBlock { #define AFTER_EXTRA // Add Member There @@ -40,16 +40,21 @@ class DragonEggBlock : public HeavyBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class DragonEggBlock : public HeavyBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class DragonEggBlock : public HeavyBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,140 +131,135 @@ class DragonEggBlock : public HeavyBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 96 + * @vftbl 95 * @symbol ?breaksFallingBlocks\@DragonEggBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 102 + * @vftbl 101 * @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 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 109 + * @vftbl 108 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_169(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_173(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 - */ - virtual void __unk_vfn_171(); - /** - * @vftbl 175 - * @symbol __unk_vfn_175 - */ - virtual void __unk_vfn_175(); - /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@DragonEggBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 195 + * @vftbl 194 * @symbol ?getDustColor\@DragonEggBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 196 + * @vftbl 195 * @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 197 - * @symbol __unk_vfn_197 + * @vftbl 196 + * @symbol __unk_vfn_196 */ - virtual void __unk_vfn_197(); + virtual void __unk_vfn_196(); /** * @symbol ??0DragonEggBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/DragonFireball.hpp b/LiteLoader/include/llapi/mc/DragonFireball.hpp index 3d25f8d435..81918ef142 100644 --- a/LiteLoader/include/llapi/mc/DragonFireball.hpp +++ b/LiteLoader/include/llapi/mc/DragonFireball.hpp @@ -37,127 +37,122 @@ class DragonFireball : public Fireball { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 - */ - virtual void __unk_vfn_88(); - /** - * @vftbl 95 + * @vftbl 93 * @symbol ?isPickable\@DragonFireball\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 + */ + virtual void __unk_vfn_94(); + /** + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@DragonFireball\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 269 + * @symbol __unk_vfn_269 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_269(); /** - * @vftbl 278 + * @vftbl 270 * @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 56c6ed06d1..93f25e05aa 100644 --- a/LiteLoader/include/llapi/mc/DriedKelpBlock.hpp +++ b/LiteLoader/include/llapi/mc/DriedKelpBlock.hpp @@ -40,16 +40,21 @@ class DriedKelpBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class DriedKelpBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class DriedKelpBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,105 +131,100 @@ class DriedKelpBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 3c7a1d2c2c..4316b9d6a2 100644 --- a/LiteLoader/include/llapi/mc/DropperBlock.hpp +++ b/LiteLoader/include/llapi/mc/DropperBlock.hpp @@ -40,16 +40,21 @@ class DropperBlock : public DispenserBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class DropperBlock : public DispenserBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class DropperBlock : public DispenserBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,117 +131,112 @@ class DropperBlock : public DispenserBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@DropperBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@DropperBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 197 + * @vftbl 196 * @symbol ?dispenseFrom\@DropperBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void dispenseFrom(class BlockSource &, class BlockPos const &) const; diff --git a/LiteLoader/include/llapi/mc/DropperBlockActor.hpp b/LiteLoader/include/llapi/mc/DropperBlockActor.hpp index b3bd2b52ce..112b3aa576 100644 --- a/LiteLoader/include/llapi/mc/DropperBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/DropperBlockActor.hpp @@ -48,17 +48,13 @@ class DropperBlockActor { * @symbol ?pushOutItems\@DropperBlockActor\@\@QEAA_NAEAVBlockSource\@\@\@Z */ MCAPI bool pushOutItems(class BlockSource &); - -//private: /** - * @symbol ?_addItem\@DropperBlockActor\@\@AEAA_NAEAVContainer\@\@AEAVItemStack\@\@H\@Z + * @symbol ?addItemsToContainerAndDepleteStack\@DropperBlockActor\@\@SA_NAEAVContainer\@\@AEAVItemStack\@\@HH\@Z */ - MCAPI bool _addItem(class Container &, class ItemStack &, int); + MCAPI static bool addItemsToContainerAndDepleteStack(class Container &, class ItemStack &, int, int); /** - * @symbol ?_getContainerAt\@DropperBlockActor\@\@AEAAPEAVContainer\@\@AEAVBlockSource\@\@AEBVVec3\@\@\@Z + * @symbol ?getContainerAt\@DropperBlockActor\@\@SAPEAVContainer\@\@AEAVBlockSource\@\@AEBVVec3\@\@\@Z */ - MCAPI class Container * _getContainerAt(class BlockSource &, class Vec3 const &); - -private: + MCAPI static class Container * getContainerAt(class BlockSource &, class Vec3 const &); }; diff --git a/LiteLoader/include/llapi/mc/DurabilityItemComponent.hpp b/LiteLoader/include/llapi/mc/DurabilityItemComponent.hpp index 930f23be26..6bfde0e6e5 100644 --- a/LiteLoader/include/llapi/mc/DurabilityItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/DurabilityItemComponent.hpp @@ -49,16 +49,11 @@ class DurabilityItemComponent { virtual void __unk_vfn_3(); /** * @vftbl 4 - * @symbol __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 * @symbol ?buildNetworkTag\@?$NetworkedItemComponent\@VDurabilityItemComponent\@\@\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 5 * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VDurabilityItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/DyePowderItem.hpp b/LiteLoader/include/llapi/mc/DyePowderItem.hpp index c19658d4c5..d78f76654f 100644 --- a/LiteLoader/include/llapi/mc/DyePowderItem.hpp +++ b/LiteLoader/include/llapi/mc/DyePowderItem.hpp @@ -36,11 +36,6 @@ class DyePowderItem : public FertilizerItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -58,9 +53,9 @@ class DyePowderItem : public FertilizerItem { virtual void __unk_vfn_16(); /** * @vftbl 19 - * @symbol ?isDye\@DyePowderItem\@\@UEBA_NXZ + * @symbol __unk_vfn_19 */ - virtual bool isDye() const; + virtual void __unk_vfn_19(); /** * @vftbl 20 * @symbol ?getItemColor\@DyePowderItem\@\@UEBA?AW4ItemColor\@\@XZ @@ -132,15 +127,31 @@ class DyePowderItem : public FertilizerItem { */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 117 + * @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\@DyePowderItem\@\@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 132 + * @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 */ diff --git a/LiteLoader/include/llapi/mc/DyePowderItemComponent.hpp b/LiteLoader/include/llapi/mc/DyePowderItemComponent.hpp deleted file mode 100644 index ee194e1bc4..0000000000 --- a/LiteLoader/include/llapi/mc/DyePowderItemComponent.hpp +++ /dev/null @@ -1,80 +0,0 @@ -/** - * @file DyePowderItemComponent.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 DyePowderItemComponent. - * - */ -class DyePowderItemComponent { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_DYEPOWDERITEMCOMPONENT -public: - class DyePowderItemComponent& operator=(class DyePowderItemComponent const &) = delete; - DyePowderItemComponent(class DyePowderItemComponent const &) = delete; - DyePowderItemComponent() = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VDyePowderItemComponent\@\@\@\@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 __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 - * @symbol ?buildNetworkTag\@?$NetworkedItemComponent\@VDyePowderItemComponent\@\@\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ - */ - virtual std::unique_ptr buildNetworkTag() const; - /** - * @vftbl 6 - * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VDyePowderItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z - */ - virtual bool initializeFromNetwork(class CompoundTag const &); - /** - * @symbol ?isValidAuxValue\@DyePowderItemComponent\@\@QEBA_NH\@Z - */ - MCAPI bool isValidAuxValue(int) const; - /** - * @symbol ?bindType\@DyePowderItemComponent\@\@SAXXZ - */ - MCAPI static void bindType(); - /** - * @symbol ?getIdentifier\@DyePowderItemComponent\@\@SAAEBVHashedString\@\@XZ - */ - MCAPI static class HashedString const & getIdentifier(); - -}; diff --git a/LiteLoader/include/llapi/mc/DynamicProperties.hpp b/LiteLoader/include/llapi/mc/DynamicProperties.hpp index eeb16e250c..7e1475c308 100644 --- a/LiteLoader/include/llapi/mc/DynamicProperties.hpp +++ b/LiteLoader/include/llapi/mc/DynamicProperties.hpp @@ -39,6 +39,10 @@ class DynamicProperties { * @symbol ?getDynamicProperty\@DynamicProperties\@\@QEAAPEAV?$variant\@M_NV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@0\@Z */ MCAPI class std::variant * getDynamicProperty(std::string const &, std::string const &); + /** + * @symbol ?registerLevelStorageManagerListener\@DynamicProperties\@\@QEAAXAEAVLevelStorageManager\@\@\@Z + */ + MCAPI void registerLevelStorageManagerListener(class LevelStorageManager &); /** * @symbol ?removeDynamicProperty\@DynamicProperties\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ diff --git a/LiteLoader/include/llapi/mc/Editor.hpp b/LiteLoader/include/llapi/mc/Editor.hpp index 6f89d11642..6d8465947f 100644 --- a/LiteLoader/include/llapi/mc/Editor.hpp +++ b/LiteLoader/include/llapi/mc/Editor.hpp @@ -10,4 +10,3 @@ #undef BEFORE_EXTRA - diff --git a/LiteLoader/include/llapi/mc/EditorNetworkPacket.hpp b/LiteLoader/include/llapi/mc/EditorNetworkPacket.hpp index f15d65d43d..3b138ec669 100644 --- a/LiteLoader/include/llapi/mc/EditorNetworkPacket.hpp +++ b/LiteLoader/include/llapi/mc/EditorNetworkPacket.hpp @@ -49,9 +49,9 @@ class EditorNetworkPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@EditorNetworkPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@EditorNetworkPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0EditorNetworkPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/EduUriResourcePacket.hpp b/LiteLoader/include/llapi/mc/EduUriResourcePacket.hpp index 7ff21bf899..23e4ba963e 100644 --- a/LiteLoader/include/llapi/mc/EduUriResourcePacket.hpp +++ b/LiteLoader/include/llapi/mc/EduUriResourcePacket.hpp @@ -51,9 +51,9 @@ class EduUriResourcePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@EduUriResourcePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@EduUriResourcePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_EDUURIRESOURCEPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/EducationLevelSettings.hpp b/LiteLoader/include/llapi/mc/EducationLevelSettings.hpp index e4c9565dde..bcc403e9de 100644 --- a/LiteLoader/include/llapi/mc/EducationLevelSettings.hpp +++ b/LiteLoader/include/llapi/mc/EducationLevelSettings.hpp @@ -22,14 +22,14 @@ struct EducationLevelSettings { #undef AFTER_EXTRA public: - /** - * @symbol ??0EducationLevelSettings\@\@QEAA\@AEBU0\@\@Z - */ - MCAPI EducationLevelSettings(struct EducationLevelSettings const &); /** * @symbol ??0EducationLevelSettings\@\@QEAA\@XZ */ MCAPI EducationLevelSettings(); + /** + * @symbol ??0EducationLevelSettings\@\@QEAA\@AEBU0\@\@Z + */ + MCAPI EducationLevelSettings(struct EducationLevelSettings const &); /** * @symbol ?getCommandOverrideFunctor\@EducationLevelSettings\@\@QEBA?AV?$function\@$$A6AXAEAUCommandFlag\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/EducationSettingsPacket.hpp b/LiteLoader/include/llapi/mc/EducationSettingsPacket.hpp index 225d314f4c..d7c0e4ded6 100644 --- a/LiteLoader/include/llapi/mc/EducationSettingsPacket.hpp +++ b/LiteLoader/include/llapi/mc/EducationSettingsPacket.hpp @@ -51,9 +51,9 @@ class EducationSettingsPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@EducationSettingsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@EducationSettingsPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_EDUCATIONSETTINGSPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/EggItem.hpp b/LiteLoader/include/llapi/mc/EggItem.hpp index d2b63ed763..4c49fa4c49 100644 --- a/LiteLoader/include/llapi/mc/EggItem.hpp +++ b/LiteLoader/include/llapi/mc/EggItem.hpp @@ -36,11 +36,6 @@ class EggItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class EggItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 23 * @symbol ?isThrowable\@EggItem\@\@UEBA_NXZ @@ -116,5 +116,15 @@ class EggItem : public Item { * @symbol ?dispense\@EggItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); }; diff --git a/LiteLoader/include/llapi/mc/ElementBlock.hpp b/LiteLoader/include/llapi/mc/ElementBlock.hpp index b833a93304..3583c255ef 100644 --- a/LiteLoader/include/llapi/mc/ElementBlock.hpp +++ b/LiteLoader/include/llapi/mc/ElementBlock.hpp @@ -40,16 +40,21 @@ class ElementBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class ElementBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class ElementBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,125 +131,120 @@ class ElementBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 66 + * @vftbl 65 * @symbol ?canBeUsedInCommands\@ElementBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 158 + * @vftbl 156 * @symbol ?tryLegacyUpgrade\@ElementBlock\@\@UEBAPEBVBlock\@\@G\@Z */ virtual class Block const * tryLegacyUpgrade(unsigned short) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 186 + * @vftbl 185 * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 f7b9c008ea..687093e2a7 100644 --- a/LiteLoader/include/llapi/mc/ElementBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/ElementBlockItem.hpp @@ -36,11 +36,6 @@ class ElementBlockItem : public AuxDataBlockItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class ElementBlockItem : public AuxDataBlockItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -106,5 +106,15 @@ class ElementBlockItem : public AuxDataBlockItem { * @symbol ?fixupCommon\@ElementBlockItem\@\@EEBAXAEAVItemStackBase\@\@\@Z */ virtual void fixupCommon(class ItemStackBase &) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); }; diff --git a/LiteLoader/include/llapi/mc/EmoteListPacket.hpp b/LiteLoader/include/llapi/mc/EmoteListPacket.hpp index 17dd7cb9fa..c5d3304b04 100644 --- a/LiteLoader/include/llapi/mc/EmoteListPacket.hpp +++ b/LiteLoader/include/llapi/mc/EmoteListPacket.hpp @@ -51,9 +51,9 @@ class EmoteListPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@EmoteListPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@EmoteListPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 604813e05b..206a9be0ec 100644 --- a/LiteLoader/include/llapi/mc/EmotePacket.hpp +++ b/LiteLoader/include/llapi/mc/EmotePacket.hpp @@ -51,9 +51,9 @@ class EmotePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@EmotePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@EmotePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_EMOTEPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/EmptyMapItem.hpp b/LiteLoader/include/llapi/mc/EmptyMapItem.hpp index bd8a2d5e94..ad13c57df4 100644 --- a/LiteLoader/include/llapi/mc/EmptyMapItem.hpp +++ b/LiteLoader/include/llapi/mc/EmptyMapItem.hpp @@ -36,11 +36,6 @@ class EmptyMapItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class EmptyMapItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -117,12 +117,22 @@ class EmptyMapItem : public Item { */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 119 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 121 * @symbol ?getInteractText\@EmptyMapItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPlayer\@\@\@Z */ virtual std::string getInteractText(class Player const &) const; /** - * @vftbl 133 + * @vftbl 135 * @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/Enchant.hpp b/LiteLoader/include/llapi/mc/Enchant.hpp index 83b1dbd719..106f0c975b 100644 --- a/LiteLoader/include/llapi/mc/Enchant.hpp +++ b/LiteLoader/include/llapi/mc/Enchant.hpp @@ -259,6 +259,10 @@ enum class Type : uint8_t * @symbol ?getEnchant\@Enchant\@\@SAPEBV1\@AEBW4Type\@1\@\@Z */ MCAPI static class Enchant const * getEnchant(enum class Enchant::Type const &); + /** + * @symbol ?getEnchantTypeFromName\@Enchant\@\@SA?AW4Type\@1\@AEBVHashedString\@\@\@Z + */ + MCAPI static enum class Enchant::Type getEnchantTypeFromName(class HashedString const &); /** * @symbol ?initEnchants\@Enchant\@\@SAXXZ */ diff --git a/LiteLoader/include/llapi/mc/EnchantUtils.hpp b/LiteLoader/include/llapi/mc/EnchantUtils.hpp index 912f691f19..8b9b443964 100644 --- a/LiteLoader/include/llapi/mc/EnchantUtils.hpp +++ b/LiteLoader/include/llapi/mc/EnchantUtils.hpp @@ -47,17 +47,17 @@ class EnchantUtils { */ MCAPI static void appendEnchantToFormattedText(enum class Enchant::Type, class std::basic_string_view>, std::string &); /** - * @symbol ?applyEnchant\@EnchantUtils\@\@SA_NAEAVItemStackBase\@\@AEBVEnchantmentInstance\@\@_N\@Z + * @symbol ?applyEnchant\@EnchantUtils\@\@SA_NAEAVItemStackBase\@\@W4Type\@Enchant\@\@H_N\@Z */ - MCAPI static bool applyEnchant(class ItemStackBase &, class EnchantmentInstance const &, bool); + MCAPI static bool applyEnchant(class ItemStackBase &, enum class Enchant::Type, int, bool); /** * @symbol ?applyEnchant\@EnchantUtils\@\@SAHAEAVItemStackBase\@\@AEBVItemEnchants\@\@_N\@Z */ MCAPI static int applyEnchant(class ItemStackBase &, class ItemEnchants const &, bool); /** - * @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 ?canEnchant\@EnchantUtils\@\@SA?AUEnchantResult\@\@AEBVItemStackBase\@\@AEBVEnchantmentInstance\@\@_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/EnchantedBookItem.hpp b/LiteLoader/include/llapi/mc/EnchantedBookItem.hpp index edda22f26e..54ea1321b0 100644 --- a/LiteLoader/include/llapi/mc/EnchantedBookItem.hpp +++ b/LiteLoader/include/llapi/mc/EnchantedBookItem.hpp @@ -36,11 +36,6 @@ class EnchantedBookItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class EnchantedBookItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 50 * @symbol ?isGlint\@EnchantedBookItem\@\@UEBA_NAEBVItemStackBase\@\@\@Z @@ -116,6 +116,16 @@ class EnchantedBookItem : public Item { * @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 ??0EnchantedBookItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/EnchantingTableBlock.hpp b/LiteLoader/include/llapi/mc/EnchantingTableBlock.hpp index c64b6a4125..b11a7b52f6 100644 --- a/LiteLoader/include/llapi/mc/EnchantingTableBlock.hpp +++ b/LiteLoader/include/llapi/mc/EnchantingTableBlock.hpp @@ -45,16 +45,21 @@ class EnchantingTableBlock : public ActorBlock { * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class EnchantingTableBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class EnchantingTableBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,115 +136,110 @@ class EnchantingTableBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 69 + * @vftbl 68 * @symbol ?checkIsPathable\@EnchantingTableBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 + */ + virtual void __unk_vfn_74(); + /** + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@EnchantingTableBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #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 b16416f6e4..1e410aaf3c 100644 --- a/LiteLoader/include/llapi/mc/EnchantingTableBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/EnchantingTableBlockActor.hpp @@ -91,17 +91,17 @@ class EnchantingTableBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); /** - * @vftbl 37 + * @vftbl 39 * @symbol ?_getUpdatePacket\@EnchantingTableBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 38 + * @vftbl 40 * @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 76c7bbec86..09518c74be 100644 --- a/LiteLoader/include/llapi/mc/EndCrystalItem.hpp +++ b/LiteLoader/include/llapi/mc/EndCrystalItem.hpp @@ -36,11 +36,6 @@ class EndCrystalItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class EndCrystalItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 50 * @symbol ?isGlint\@EndCrystalItem\@\@UEBA_NAEBVItemStackBase\@\@\@Z @@ -112,7 +112,17 @@ class EndCrystalItem : public Item { */ virtual void __unk_vfn_80(); /** - * @vftbl 132 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 134 * @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 07d79e3094..5f38bef9ed 100644 --- a/LiteLoader/include/llapi/mc/EndGatewayBlock.hpp +++ b/LiteLoader/include/llapi/mc/EndGatewayBlock.hpp @@ -50,16 +50,21 @@ class EndGatewayBlock : public ActorBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -72,14 +77,14 @@ class EndGatewayBlock : public ActorBlock { virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol __unk_vfn_34 + * @symbol ?isWaterBlocking\@EndGatewayBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_34(); + virtual bool isWaterBlocking() const; /** * @vftbl 35 - * @symbol ?isWaterBlocking\@EndGatewayBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_35 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -111,10 +116,10 @@ class EndGatewayBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -141,15 +146,15 @@ class EndGatewayBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -157,111 +162,106 @@ class EndGatewayBlock : public ActorBlock { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@EndGatewayBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 102 + * @vftbl 101 * @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 103 + * @vftbl 102 * @symbol ?asItemInstance\@EndGatewayBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@EndGatewayBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 190 + * @vftbl 189 * @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 68e5cbbd99..d49fcebacd 100644 --- a/LiteLoader/include/llapi/mc/EndGatewayBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/EndGatewayBlockActor.hpp @@ -101,12 +101,12 @@ class EndGatewayBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); /** - * @vftbl 37 + * @vftbl 39 * @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 1cd0e8259a..50fe28edd6 100644 --- a/LiteLoader/include/llapi/mc/EndPortalBlock.hpp +++ b/LiteLoader/include/llapi/mc/EndPortalBlock.hpp @@ -55,16 +55,21 @@ class EndPortalBlock : public ActorBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -77,14 +82,14 @@ class EndPortalBlock : public ActorBlock { virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol __unk_vfn_34 + * @symbol ?isWaterBlocking\@EndPortalBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_34(); + virtual bool isWaterBlocking() const; /** * @vftbl 35 - * @symbol ?isWaterBlocking\@EndPortalBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_35 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -116,10 +121,10 @@ class EndPortalBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -146,15 +151,15 @@ class EndPortalBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -162,126 +167,121 @@ class EndPortalBlock : public ActorBlock { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@EndPortalBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 102 + * @vftbl 101 * @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 103 + * @vftbl 102 * @symbol ?asItemInstance\@EndPortalBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 113 + * @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 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@EndPortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?onFallOn\@EndPortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@EndPortalBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 195 + * @vftbl 194 * @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 2176d3c6cd..b51e97b945 100644 --- a/LiteLoader/include/llapi/mc/EndPortalBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/EndPortalBlockActor.hpp @@ -71,10 +71,10 @@ class EndPortalBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); /** * @symbol ??0EndPortalBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/EndPortalFrameBlock.hpp b/LiteLoader/include/llapi/mc/EndPortalFrameBlock.hpp index 089bd8f5f3..06a0f23250 100644 --- a/LiteLoader/include/llapi/mc/EndPortalFrameBlock.hpp +++ b/LiteLoader/include/llapi/mc/EndPortalFrameBlock.hpp @@ -55,16 +55,21 @@ class EndPortalFrameBlock : public BlockLegacy { * @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 + */ + virtual void __unk_vfn_28(); /** * @vftbl 29 * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -76,10 +81,10 @@ class EndPortalFrameBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -111,10 +116,10 @@ class EndPortalFrameBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -141,132 +146,127 @@ class EndPortalFrameBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** * @vftbl 105 - * @symbol __unk_vfn_105 - */ - virtual void __unk_vfn_105(); - /** - * @vftbl 106 * @symbol ?getPlacementBlock\@EndPortalFrameBlock\@\@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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 - */ - virtual void __unk_vfn_126(); - /** - * @vftbl 127 + * @vftbl 125 * @symbol ?getComparatorSignal\@EndPortalFrameBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@EndPortalFrameBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@EndPortalFrameBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@EndPortalFrameBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @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 95c0b13ae4..89ad118f94 100644 --- a/LiteLoader/include/llapi/mc/EndRodBlock.hpp +++ b/LiteLoader/include/llapi/mc/EndRodBlock.hpp @@ -50,16 +50,21 @@ class EndRodBlock : public BlockLegacy { * @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 + */ + virtual void __unk_vfn_28(); /** * @vftbl 29 * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -71,10 +76,10 @@ class EndRodBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +111,10 @@ class EndRodBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,160 +141,155 @@ class EndRodBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 69 + * @vftbl 68 * @symbol ?checkIsPathable\@EndRodBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 91 + * @vftbl 90 * @symbol ?mayPlace\@EndRodBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@EndRodBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 96 + * @vftbl 95 * @symbol ?breaksFallingBlocks\@EndRodBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@EndRodBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@EndRodBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@EndRodBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 162 + * @vftbl 160 * @symbol ?_addHardCodedBlockComponents\@EndRodBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@EndRodBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 + * @vftbl 185 * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 a96452f77d..5e74195fed 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 ?write\@EndTag\@\@UEBAXAEAVIDataOutput\@\@\@Z + * @symbol __unk_vfn_2 */ - virtual void write(class IDataOutput &) const; + virtual void __unk_vfn_2(); /** * @vftbl 3 * @symbol ?load\@EndTag\@\@UEAAXAEAVIDataInput\@\@\@Z @@ -75,5 +75,11 @@ 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 b93f61b5c6..8a710afb02 100644 --- a/LiteLoader/include/llapi/mc/EnderChestBlock.hpp +++ b/LiteLoader/include/llapi/mc/EnderChestBlock.hpp @@ -40,16 +40,21 @@ class EnderChestBlock : public ChestBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class EnderChestBlock : public ChestBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class EnderChestBlock : public ChestBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,117 +131,112 @@ class EnderChestBlock : public ChestBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@EnderChestBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@EnderChestBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@EnderChestBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/EnderChestContainer.hpp b/LiteLoader/include/llapi/mc/EnderChestContainer.hpp index 88dddc0b48..f7076b358c 100644 --- a/LiteLoader/include/llapi/mc/EnderChestContainer.hpp +++ b/LiteLoader/include/llapi/mc/EnderChestContainer.hpp @@ -35,25 +35,25 @@ class EnderChestContainer : public FillingContainer { */ virtual void __unk_vfn_0(); /** - * @vftbl 17 + * @vftbl 18 * @symbol ?startOpen\@EnderChestContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void startOpen(class Player &); /** - * @vftbl 18 + * @vftbl 19 * @symbol ?stopOpen\@EnderChestContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void stopOpen(class Player &); - /** - * @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(); /** * @symbol ??0EnderChestContainer\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/EnderCrystal.hpp b/LiteLoader/include/llapi/mc/EnderCrystal.hpp index 83b1a3f4ad..c47eaa14c0 100644 --- a/LiteLoader/include/llapi/mc/EnderCrystal.hpp +++ b/LiteLoader/include/llapi/mc/EnderCrystal.hpp @@ -36,140 +36,135 @@ class EnderCrystal : public Actor { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@EnderCrystal\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 80 + * @vftbl 78 * @symbol ?getShadowRadius\@EnderCrystal\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_80(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_86(); /** - * @vftbl 95 + * @vftbl 93 * @symbol ?isPickable\@EnderCrystal\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_94(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_97(); + /** + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 134 + * @vftbl 132 * @symbol ?isInvulnerableTo\@EnderCrystal\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@EnderCrystal\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@EnderCrystal\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@EnderCrystal\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** * @symbol ??0EnderCrystal\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/EnderDragon.hpp b/LiteLoader/include/llapi/mc/EnderDragon.hpp index ae9d572114..b232dada6e 100644 --- a/LiteLoader/include/llapi/mc/EnderDragon.hpp +++ b/LiteLoader/include/llapi/mc/EnderDragon.hpp @@ -47,195 +47,190 @@ class EnderDragon : public Monster { */ virtual void remove(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 80 + * @vftbl 78 * @symbol ?getShadowRadius\@EnderDragon\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 81 + * @vftbl 79 * @symbol ?getHeadLookVector\@EnderDragon\@\@UEBA?AVVec3\@\@M\@Z */ virtual class Vec3 getHeadLookVector(float) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_80(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_86(); /** - * @vftbl 92 + * @vftbl 90 * @symbol ?isImmobile\@EnderDragon\@\@UEBA_NXZ */ virtual bool isImmobile() const; /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_94(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_97(); + /** + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 120 + * @vftbl 118 * @symbol ?setSitting\@EnderDragon\@\@UEAAX_N\@Z */ virtual void setSitting(bool); /** - * @vftbl 134 + * @vftbl 132 * @symbol ?isInvulnerableTo\@EnderDragon\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 141 + * @vftbl 139 * @symbol ?handleEntityEvent\@EnderDragon\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 177 + * @vftbl 175 * @symbol ?canChangeDimensionsUsingPortal\@EnderDragon\@\@UEBA_NXZ */ virtual bool canChangeDimensionsUsingPortal() const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 190 + * @vftbl 188 * @symbol ?canBePulledIntoVehicle\@EnderDragon\@\@UEBA_NXZ */ virtual bool canBePulledIntoVehicle() const; /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 207 + * @vftbl 205 * @symbol ?canBeAffected\@EnderDragon\@\@UEBA_NI\@Z */ virtual bool canBeAffected(unsigned int) const; /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 245 + * @vftbl 237 * @symbol ?die\@EnderDragon\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 258 + * @vftbl 250 * @symbol ?updateEntitySpecificMolangVariables\@EnderDragon\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@EnderDragon\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 274 + * @vftbl 266 * @symbol ?_onSizeUpdated\@EnderDragon\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 349 + * @vftbl 341 * @symbol ?tickDeath\@EnderDragon\@\@MEAAXXZ */ virtual void tickDeath(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); #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 089ffead1b..c2767708d9 100644 --- a/LiteLoader/include/llapi/mc/EnderEyeItem.hpp +++ b/LiteLoader/include/llapi/mc/EnderEyeItem.hpp @@ -36,11 +36,6 @@ class EnderEyeItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class EnderEyeItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 23 * @symbol ?isThrowable\@EnderEyeItem\@\@UEBA_NXZ @@ -111,6 +111,16 @@ class EnderEyeItem : public Item { * @symbol ?use\@EnderEyeItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); /** * @symbol ??0EnderEyeItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/EnderMan.hpp b/LiteLoader/include/llapi/mc/EnderMan.hpp index 337fc92867..e9dbc533e8 100644 --- a/LiteLoader/include/llapi/mc/EnderMan.hpp +++ b/LiteLoader/include/llapi/mc/EnderMan.hpp @@ -37,170 +37,165 @@ class EnderMan : public Monster { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@EnderMan\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 131 + * @vftbl 129 * @symbol ?shouldRender\@EnderMan\@\@UEBA_NXZ */ virtual bool shouldRender() const; /** - * @vftbl 133 + * @vftbl 131 * @symbol ?getAmbientSound\@EnderMan\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getAmbientSound() const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 208 + * @vftbl 206 * @symbol ?canBeAffectedByArrow\@EnderMan\@\@UEBA_NAEBVMobEffectInstance\@\@\@Z */ virtual bool canBeAffectedByArrow(class MobEffectInstance const &) const; /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@EnderMan\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@EnderMan\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@EnderMan\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 283 + * @vftbl 275 * @symbol ?hurtEffects\@EnderMan\@\@UEAAXAEBVActorDamageSource\@\@M_N1\@Z */ virtual void hurtEffects(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 346 + * @vftbl 338 * @symbol ?newServerAiStep\@EnderMan\@\@UEAAXXZ */ virtual void newServerAiStep(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0EnderMan\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/Endermite.hpp b/LiteLoader/include/llapi/mc/Endermite.hpp index 0f3fe98318..ef40defe41 100644 --- a/LiteLoader/include/llapi/mc/Endermite.hpp +++ b/LiteLoader/include/llapi/mc/Endermite.hpp @@ -37,155 +37,150 @@ class Endermite : public Monster { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@Endermite\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 - */ - virtual void __unk_vfn_260(); - /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@Endermite\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@Endermite\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 274 + * @vftbl 266 * @symbol ?_onSizeUpdated\@Endermite\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 288 + * @vftbl 280 * @symbol ?aiStep\@Endermite\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 293 + * @vftbl 285 * @symbol ?checkSpawnRules\@Endermite\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0Endermite\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/EnderpearlItem.hpp b/LiteLoader/include/llapi/mc/EnderpearlItem.hpp index c335f28714..476a55c350 100644 --- a/LiteLoader/include/llapi/mc/EnderpearlItem.hpp +++ b/LiteLoader/include/llapi/mc/EnderpearlItem.hpp @@ -36,11 +36,6 @@ class EnderpearlItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class EnderpearlItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 23 * @symbol ?isThrowable\@EnderpearlItem\@\@UEBA_NXZ @@ -121,6 +121,16 @@ class EnderpearlItem : public Item { * @symbol ?getCooldownTime\@EnderpearlItem\@\@UEBAHXZ */ virtual int getCooldownTime() const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); /** * @symbol ??0EnderpearlItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/EntityPlacerItemComponent.hpp b/LiteLoader/include/llapi/mc/EntityPlacerItemComponent.hpp index a6c7514bbf..4cbc06df36 100644 --- a/LiteLoader/include/llapi/mc/EntityPlacerItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/EntityPlacerItemComponent.hpp @@ -36,9 +36,9 @@ class EntityPlacerItemComponent { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VEntityPlacerItemComponent\@\@\@\@UEBA_NXZ + * @symbol __unk_vfn_1 */ - virtual bool isNetworkComponent() const; + virtual void __unk_vfn_1(); /** * @vftbl 2 * @symbol __unk_vfn_2 @@ -46,24 +46,40 @@ class EntityPlacerItemComponent { virtual void __unk_vfn_2(); /** * @vftbl 3 - * @symbol ?useOn\@EntityPlacerItemComponent\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol __unk_vfn_3 */ - virtual bool useOn(class ItemStack &, class Actor &, class BlockPos const &, unsigned char, class Vec3 const &) const; + virtual void __unk_vfn_3(); /** * @vftbl 4 - * @symbol __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 * @symbol ?buildNetworkTag\@?$NetworkedItemComponent\@VEntityPlacerItemComponent\@\@\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 5 * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VEntityPlacerItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); + /** + * @vftbl 6 + * @symbol ?handleVersionBasedInitialization\@EntityPlacerItemComponent\@\@UEAAXAEBVSemVersion\@\@\@Z + */ + virtual void handleVersionBasedInitialization(class SemVersion const &); + /** + * @vftbl 7 + * @symbol __unk_vfn_7 + */ + virtual void __unk_vfn_7(); + /** + * @vftbl 8 + * @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; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENTITYPLACERITEMCOMPONENT + /** + * @symbol ?_canUseOn\@EntityPlacerItemComponent\@\@MEBA_NAEBVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@E\@Z + */ + MCVAPI bool _canUseOn(class ItemStack const &, class Actor &, class BlockPos const &, unsigned char) const; +#endif /** * @symbol ?dispense\@EntityPlacerItemComponent\@\@QEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ diff --git a/LiteLoader/include/llapi/mc/EntityServerPacket.hpp b/LiteLoader/include/llapi/mc/EntityServerPacket.hpp index 11a29b1f30..14d8385a50 100644 --- a/LiteLoader/include/llapi/mc/EntityServerPacket.hpp +++ b/LiteLoader/include/llapi/mc/EntityServerPacket.hpp @@ -41,9 +41,9 @@ class EntityServerPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@EntityServerPacket\@\@MEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@EntityServerPacket\@\@MEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENTITYSERVERPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/EntitySystems.hpp b/LiteLoader/include/llapi/mc/EntitySystems.hpp index 165e329ca3..c262899742 100644 --- a/LiteLoader/include/llapi/mc/EntitySystems.hpp +++ b/LiteLoader/include/llapi/mc/EntitySystems.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 @@ -92,4 +93,12 @@ class EntitySystems { */ MCAPI void tickEditor(class EntityRegistry &); +//private: + /** + * @symbol ?_singleTickCategory\@EntitySystems\@\@AEAAXV?$typeid_t\@USystemCategory\@\@\@Bedrock\@\@AEAVEntityContext\@\@\@Z + */ + MCAPI void _singleTickCategory(class Bedrock::typeid_t, class EntityContext &); + +private: + }; diff --git a/LiteLoader/include/llapi/mc/EntitySystemsCollection.hpp b/LiteLoader/include/llapi/mc/EntitySystemsCollection.hpp new file mode 100644 index 0000000000..ce5b05b001 --- /dev/null +++ b/LiteLoader/include/llapi/mc/EntitySystemsCollection.hpp @@ -0,0 +1,24 @@ +/** + * @file EntitySystemsCollection.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace EntitySystemsCollection { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?create\@EntitySystemsCollection\@\@YA?AV?$unique_ptr\@UIEntitySystemsCollection\@\@U?$default_delete\@UIEntitySystemsCollection\@\@\@std\@\@\@std\@\@XZ + */ + MCAPI std::unique_ptr create(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/EventPacket.hpp b/LiteLoader/include/llapi/mc/EventPacket.hpp index a680033a7e..ba3795c741 100644 --- a/LiteLoader/include/llapi/mc/EventPacket.hpp +++ b/LiteLoader/include/llapi/mc/EventPacket.hpp @@ -104,15 +104,23 @@ class EventPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@EventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@EventPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + 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 */ @@ -122,13 +130,9 @@ class EventPacket : public Packet { */ MCAPI EventPacket(class Player const *, class gsl::not_null); /** - * @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 ??0EventPacket\@\@QEAA\@AEBVPlayer\@\@W4MovementEventType\@\@MMMMM\@Z + * @symbol ??0EventPacket\@\@QEAA\@AEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ - MCAPI EventPacket(class Player const &, enum class MovementEventType, float, float, float, float, float); + MCAPI EventPacket(class Player const &, std::string const &, int); /** * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ @@ -137,18 +141,10 @@ class EventPacket : public Packet { * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@HV?$not_null\@PEBVActor\@\@\@gsl\@\@\@Z */ MCAPI EventPacket(class Player const *, int, 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\@\@FIF\@Z */ MCAPI EventPacket(class Player const *, short, unsigned int, short); - /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@HHW4ActorDamageCause\@\@_N\@Z - */ - MCAPI EventPacket(class Player const *, int, int, enum class ActorDamageCause, bool); /** * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HH1\@Z */ @@ -157,6 +153,10 @@ class EventPacket : public Packet { * @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 */ @@ -165,22 +165,22 @@ class EventPacket : public Packet { * @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\@XZ - */ - MCAPI EventPacket(); /** * @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\@\@PEBVActor\@\@V?$not_null\@PEBVMob\@\@\@gsl\@\@W4ActorDamageCause\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4ActorType\@\@\@Z + * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@V?$not_null\@PEBVActor\@\@\@gsl\@\@W4InteractionType\@MinecraftEventing\@\@\@Z */ - MCAPI EventPacket(class Player const *, class Actor const *, class gsl::not_null, enum class ActorDamageCause, std::string, int, enum class ActorType); + MCAPI EventPacket(class Player const *, class gsl::not_null, enum class MinecraftEventing::InteractionType); /** * @symbol ??4EventPacket\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/EvocationFang.hpp b/LiteLoader/include/llapi/mc/EvocationFang.hpp index 474658f3a6..87bd4761b5 100644 --- a/LiteLoader/include/llapi/mc/EvocationFang.hpp +++ b/LiteLoader/include/llapi/mc/EvocationFang.hpp @@ -36,125 +36,120 @@ class EvocationFang : public Actor { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@EvocationFang\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 80 + * @vftbl 78 * @symbol ?getShadowRadius\@EvocationFang\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 141 + * @vftbl 139 * @symbol ?handleEntityEvent\@EvocationFang\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?getSourceUniqueID\@EvocationFang\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); + /** + * @vftbl 252 + * @symbol __unk_vfn_252 + */ + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); - /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); /** * @symbol ??0EvocationFang\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/EvocationIllager.hpp b/LiteLoader/include/llapi/mc/EvocationIllager.hpp index c4c0e619b5..8a719846e2 100644 --- a/LiteLoader/include/llapi/mc/EvocationIllager.hpp +++ b/LiteLoader/include/llapi/mc/EvocationIllager.hpp @@ -42,145 +42,140 @@ class EvocationIllager : public HumanoidMonster { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 - */ - virtual void __unk_vfn_243(); - /** - * @vftbl 245 + * @vftbl 237 * @symbol ?die\@EvocationIllager\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); + /** + * @vftbl 252 + * @symbol __unk_vfn_252 + */ + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); - /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 288 + * @vftbl 280 * @symbol ?aiStep\@EvocationIllager\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 303 + * @vftbl 295 * @symbol ?isAlliedTo\@EvocationIllager\@\@UEAA_NPEAVMob\@\@\@Z */ virtual bool isAlliedTo(class Mob *); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 310 + * @vftbl 302 * @symbol ?getArmorValue\@EvocationIllager\@\@MEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_EVOCATIONILLAGER /** * @symbol ?canExistInPeaceful\@EvocationIllager\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/ExitVehicleSystem.hpp b/LiteLoader/include/llapi/mc/ExitVehicleSystem.hpp index 28746fe532..b93f368a47 100644 --- a/LiteLoader/include/llapi/mc/ExitVehicleSystem.hpp +++ b/LiteLoader/include/llapi/mc/ExitVehicleSystem.hpp @@ -11,51 +11,22 @@ #undef BEFORE_EXTRA -struct ExitVehicleSystem { +class ExitVehicleSystem { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_EXITVEHICLESYSTEM public: - struct ExitVehicleSystem& operator=(struct ExitVehicleSystem const &) = delete; - ExitVehicleSystem(struct ExitVehicleSystem const &) = delete; + class ExitVehicleSystem& operator=(class ExitVehicleSystem const &) = delete; + ExitVehicleSystem(class ExitVehicleSystem const &) = delete; ExitVehicleSystem() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_vfn_0 + * @symbol ?createSystem\@ExitVehicleSystem\@\@SA?AUTickingSystemWithInfo\@\@AEBVBaseGameVersion\@\@\@Z */ - 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\@ExitVehicleSystem\@\@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\@\@UPlayerGameTypeComponent\@\@UMobBodyRotationComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@UDimensionTypeComponent\@\@UPassengerComponent\@\@UVehicleComponent\@\@\@\@U?$Write\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UStateVectorComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@UActorMoveToRequestComponent\@\@UActorSetPositionRequestComponent\@\@\@\@U?$GlobalRead\@UBaseGameVersionComponent\@\@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<>> &); - /** - * @symbol ?_tickExitVehicle\@ExitVehicleSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUPassengerComponent\@\@AEAUAABBShapeComponent\@\@AEAUActorRotationComponent\@\@AEAUStateVectorComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@\@\@AEBVBaseGameVersion\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@$$CBUStateVectorComponent\@\@\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UActorMoveToRequestComponent\@\@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\@\@UPlayerGameTypeComponent\@\@UMobBodyRotationComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@UDimensionTypeComponent\@\@UPassengerComponent\@\@UVehicleComponent\@\@\@\@U?$Write\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UStateVectorComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@UActorMoveToRequestComponent\@\@UActorSetPositionRequestComponent\@\@\@\@U?$GlobalRead\@UBaseGameVersionComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@AEBVIConstBlockSource\@\@\@Z - */ - MCAPI static void _tickExitVehicle(class StrictEntityContext const &, struct PassengerComponent const &, struct AABBShapeComponent &, struct ActorRotationComponent &, struct StateVectorComponent &, 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 &); - /** - * @symbol ?createSystem\@ExitVehicleSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); + MCAPI static struct TickingSystemWithInfo createSystem(class BaseGameVersion const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExitVehicleSystemImpl.hpp b/LiteLoader/include/llapi/mc/ExitVehicleSystemImpl.hpp new file mode 100644 index 0000000000..0f9c7cbf26 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ExitVehicleSystemImpl.hpp @@ -0,0 +1,66 @@ +/** + * @file ExitVehicleSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct ExitVehicleSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_EXITVEHICLESYSTEMIMPL +public: + struct ExitVehicleSystemImpl& operator=(struct ExitVehicleSystemImpl const &) = delete; + ExitVehicleSystemImpl(struct ExitVehicleSystemImpl const &) = delete; + ExitVehicleSystemImpl() = 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\@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 + */ + 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<>> &); + /** + * @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 + */ + 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 &); + /** + * @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 + */ + 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 &); + /** + * @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 + */ + 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<>> &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ExpectedAnywhereConsume.hpp b/LiteLoader/include/llapi/mc/ExpectedAnywhereConsume.hpp new file mode 100644 index 0000000000..c0ebf48a30 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ExpectedAnywhereConsume.hpp @@ -0,0 +1,32 @@ +/** + * @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/ExperienceOrb.hpp b/LiteLoader/include/llapi/mc/ExperienceOrb.hpp index 395a693177..4efa568542 100644 --- a/LiteLoader/include/llapi/mc/ExperienceOrb.hpp +++ b/LiteLoader/include/llapi/mc/ExperienceOrb.hpp @@ -43,145 +43,140 @@ enum class DropType; */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 80 + * @vftbl 78 * @symbol ?getShadowRadius\@ExperienceOrb\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_80(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_86(); /** - * @vftbl 89 + * @vftbl 87 * @symbol ?playerTouch\@ExperienceOrb\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void playerTouch(class Player &); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_94(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_97(); + /** + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 134 + * @vftbl 132 * @symbol ?isInvulnerableTo\@ExperienceOrb\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 255 + * @vftbl 247 * @symbol ?doWaterSplashEffect\@ExperienceOrb\@\@MEAAXXZ */ virtual void doWaterSplashEffect(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@ExperienceOrb\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@ExperienceOrb\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@ExperienceOrb\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 266 + * @vftbl 258 * @symbol ?_playStepSound\@ExperienceOrb\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** * @symbol ??0ExperienceOrb\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ @@ -213,9 +208,9 @@ enum class DropType; */ MCAPI static void _spawnOrb(class BlockSource &, class Level &, class Vec3 const &, int); /** - * @symbol ?_tryMergeExistingOrbs\@ExperienceOrb\@\@CA_NAEAVBlockSource\@\@AEBVVec3\@\@H\@Z + * @symbol ?_tryMergeIntoExistingOrbs\@ExperienceOrb\@\@CA_NAEAVBlockSource\@\@AEBVVec3\@\@H\@Z */ - MCAPI static bool _tryMergeExistingOrbs(class BlockSource &, class Vec3 const &, int); + MCAPI static bool _tryMergeIntoExistingOrbs(class BlockSource &, class Vec3 const &, int); private: diff --git a/LiteLoader/include/llapi/mc/ExperiencePotion.hpp b/LiteLoader/include/llapi/mc/ExperiencePotion.hpp index 500b7640e2..82f8576f51 100644 --- a/LiteLoader/include/llapi/mc/ExperiencePotion.hpp +++ b/LiteLoader/include/llapi/mc/ExperiencePotion.hpp @@ -37,127 +37,122 @@ class ExperiencePotion : public Throwable { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); - /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 276 + * @vftbl 268 * @symbol ?getThrowPower\@ExperiencePotion\@\@MEAAMXZ */ virtual float getThrowPower(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 269 + * @symbol __unk_vfn_269 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_269(); /** - * @vftbl 278 + * @vftbl 270 * @symbol ?getThrowUpAngleOffset\@ExperiencePotion\@\@MEAAMXZ */ virtual float getThrowUpAngleOffset(); /** - * @vftbl 279 + * @vftbl 271 * @symbol ?getGravity\@ExperiencePotion\@\@MEAAMXZ */ virtual float getGravity(); diff --git a/LiteLoader/include/llapi/mc/ExperiencePotionItem.hpp b/LiteLoader/include/llapi/mc/ExperiencePotionItem.hpp index 7100fdfbc4..1bcf656cc1 100644 --- a/LiteLoader/include/llapi/mc/ExperiencePotionItem.hpp +++ b/LiteLoader/include/llapi/mc/ExperiencePotionItem.hpp @@ -36,11 +36,6 @@ class ExperiencePotionItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class ExperiencePotionItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 23 * @symbol ?isThrowable\@ExperiencePotionItem\@\@UEBA_NXZ @@ -121,6 +121,16 @@ class ExperiencePotionItem : public Item { * @symbol ?dispense\@ExperiencePotionItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); /** * @symbol ??0ExperiencePotionItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/Experiments.hpp b/LiteLoader/include/llapi/mc/Experiments.hpp index 87f4b55f72..ce8c678eb9 100644 --- a/LiteLoader/include/llapi/mc/Experiments.hpp +++ b/LiteLoader/include/llapi/mc/Experiments.hpp @@ -24,9 +24,14 @@ class Experiments { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_EXPERIMENTS public: class Experiments& operator=(class Experiments const &) = delete; + Experiments(class Experiments const &) = delete; #endif public: + /** + * @symbol ?Cameras\@Experiments\@\@QEBA_NXZ + */ + MCAPI bool Cameras() const; /** * @symbol ?DataDrivenBiomes\@Experiments\@\@QEBA_NXZ */ @@ -35,10 +40,6 @@ class Experiments { * @symbol ?DataDrivenItems\@Experiments\@\@QEBA_NXZ */ MCAPI bool DataDrivenItems() const; - /** - * @symbol ??0Experiments\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI Experiments(class Experiments const &); /** * @symbol ??0Experiments\@\@QEAA\@XZ */ @@ -47,18 +48,10 @@ class Experiments { * @symbol ?Gametest\@Experiments\@\@QEBA_NXZ */ MCAPI bool Gametest() const; - /** - * @symbol ?NextMajorUpdate\@Experiments\@\@QEBA_NXZ - */ - MCAPI bool NextMajorUpdate() const; /** * @symbol ?ShortSneaking\@Experiments\@\@QEBA_NXZ */ MCAPI bool ShortSneaking() const; - /** - * @symbol ?Sniffer\@Experiments\@\@QEBA_NXZ - */ - MCAPI bool Sniffer() const; /** * @symbol ?UpcomingCreatorFeatures\@Experiments\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/ExpressionNode.hpp b/LiteLoader/include/llapi/mc/ExpressionNode.hpp index 3b8bc9e9a5..610c1d9042 100644 --- a/LiteLoader/include/llapi/mc/ExpressionNode.hpp +++ b/LiteLoader/include/llapi/mc/ExpressionNode.hpp @@ -45,14 +45,14 @@ class ExpressionNode { #undef AFTER_EXTRA public: - /** - * @symbol ??0ExpressionNode\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4MolangVersion\@\@V?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@\@Z - */ - MCAPI ExpressionNode(std::string const &, enum class MolangVersion, class gsl::span); /** * @symbol ??0ExpressionNode\@\@QEAA\@XZ */ MCAPI ExpressionNode(); + /** + * @symbol ??0ExpressionNode\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4MolangVersion\@\@V?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@\@Z + */ + MCAPI ExpressionNode(std::string const &, enum class MolangVersion, class gsl::span); /** * @symbol ??0ExpressionNode\@\@QEAA\@AEBV0\@\@Z */ @@ -61,10 +61,6 @@ class ExpressionNode { * @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\@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\@AEAUMolangScriptArg\@\@W4ExpressionOp\@\@\@Z */ @@ -74,13 +70,17 @@ class ExpressionNode { */ MCAPI ExpressionNode(class ExpressionNode &&); /** - * @symbol ??0ExpressionNode\@\@QEAA\@M\@Z + * @symbol ??0ExpressionNode\@\@QEAA\@AEBVValue\@Json\@\@W4MolangVersion\@\@V?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@\@Z */ - MCAPI ExpressionNode(float); + 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 */ @@ -129,6 +129,10 @@ class ExpressionNode { * @symbol ?isInitialized\@ExpressionNode\@\@QEBA_NXZ */ MCAPI bool isInitialized() const; + /** + * @symbol ?isValid\@ExpressionNode\@\@QEBA_NXZ + */ + MCAPI bool isValid() const; /** * @symbol ?link\@ExpressionNode\@\@QEBA?AW4MolangCompileResult\@\@W4MolangVersion\@\@\@Z */ @@ -220,9 +224,9 @@ class ExpressionNode { */ MCAPI bool _hasDisallowedQueryPtrs(std::vector> const &)> const *> const &) const; /** - * @symbol ?_optimize\@ExpressionNode\@\@AEAA_NW4MolangVersion\@\@\@Z + * @symbol ?_optimize\@ExpressionNode\@\@AEAA_NW4MolangVersion\@\@AEAVRenderParams\@\@H\@Z */ - MCAPI bool _optimize(enum class MolangVersion); + MCAPI bool _optimize(enum class MolangVersion, class RenderParams &, int); /** * @symbol ?_processBinaryExpressions\@ExpressionNode\@\@AEAA_NV?$function\@$$A6A_NW4ExpressionOp\@\@\@Z\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ExternalDataServerLevel.hpp b/LiteLoader/include/llapi/mc/ExternalDataServerLevel.hpp index 58cee4a7c3..792c689515 100644 --- a/LiteLoader/include/llapi/mc/ExternalDataServerLevel.hpp +++ b/LiteLoader/include/llapi/mc/ExternalDataServerLevel.hpp @@ -37,9 +37,39 @@ struct ExternalDataServerLevel { virtual bool isInGame() const; /** * @vftbl 2 + * @symbol ?getAdventureSettings\@ExternalDataServerLevel\@\@UEBAAEBUAdventureSettings\@\@XZ + */ + virtual struct AdventureSettings const & getAdventureSettings() 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 ?getDefaultGameType\@ExternalDataServerLevel\@\@UEBA?AW4GameType\@\@XZ */ virtual enum class GameType getDefaultGameType() const; + /** + * @vftbl 6 + * @symbol ?getSmoothRotationSpeed\@ExternalDataServerLevel\@\@UEBAMXZ + */ + virtual float getSmoothRotationSpeed() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_EXTERNALDATASERVERLEVEL + /** + * @symbol ?getInputMode\@ExternalDataServerLevel\@\@UEBA?AW4InputMode\@\@XZ + */ + MCVAPI enum class InputMode getInputMode() const; + /** + * @symbol ?getPlayMode\@ExternalDataServerLevel\@\@UEBA?AW4ClientPlayMode\@\@XZ + */ + MCVAPI enum class ClientPlayMode getPlayMode() const; +#endif /** * @symbol ??0ExternalDataServerLevel\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@$$CBVILevel\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/EyeOfEnder.hpp b/LiteLoader/include/llapi/mc/EyeOfEnder.hpp index 2a54fd4d80..7cda08f6eb 100644 --- a/LiteLoader/include/llapi/mc/EyeOfEnder.hpp +++ b/LiteLoader/include/llapi/mc/EyeOfEnder.hpp @@ -41,120 +41,115 @@ class EyeOfEnder : public Actor { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 47 + * @vftbl 46 * @symbol ?lerpMotion\@EyeOfEnder\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void lerpMotion(class Vec3 const &); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@EyeOfEnder\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 80 + * @vftbl 78 * @symbol ?getShadowRadius\@EyeOfEnder\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); - /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); /** * @symbol ??0EyeOfEnder\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/FaceDirectionalActorBlock.hpp b/LiteLoader/include/llapi/mc/FaceDirectionalActorBlock.hpp index cf0b7c022e..8691c8b860 100644 --- a/LiteLoader/include/llapi/mc/FaceDirectionalActorBlock.hpp +++ b/LiteLoader/include/llapi/mc/FaceDirectionalActorBlock.hpp @@ -40,16 +40,21 @@ class FaceDirectionalActorBlock : public ActorBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class FaceDirectionalActorBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class FaceDirectionalActorBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,125 +131,120 @@ class FaceDirectionalActorBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** * @vftbl 105 - * @symbol __unk_vfn_105 - */ - virtual void __unk_vfn_105(); - /** - * @vftbl 106 * @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 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 149 + * @vftbl 147 * @symbol ?getRenderBlock\@FaceDirectionalActorBlock\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getRenderBlock() const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?getMappedFace\@FaceDirectionalActorBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 151 + * @vftbl 149 * @symbol ?getFaceFlip\@FaceDirectionalActorBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z */ virtual enum class Flip getFaceFlip(unsigned char, class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #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 99fd5a3b13..8bc34d9d1d 100644 --- a/LiteLoader/include/llapi/mc/FaceDirectionalBlock.hpp +++ b/LiteLoader/include/llapi/mc/FaceDirectionalBlock.hpp @@ -40,16 +40,21 @@ class FaceDirectionalBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class FaceDirectionalBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class FaceDirectionalBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,130 +131,125 @@ class FaceDirectionalBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** * @vftbl 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 55 * @symbol ?isValidAuxValue\@FaceDirectionalBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; + /** + * @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 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** * @vftbl 105 - * @symbol __unk_vfn_105 - */ - virtual void __unk_vfn_105(); - /** - * @vftbl 106 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 149 + * @vftbl 147 * @symbol ?getRenderBlock\@FaceDirectionalBlock\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getRenderBlock() const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?getMappedFace\@FaceDirectionalBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 151 + * @vftbl 149 * @symbol ?getFaceFlip\@FaceDirectionalBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z */ virtual enum class Flip getFaceFlip(unsigned char, class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FACEDIRECTIONALBLOCK /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/Facing.hpp b/LiteLoader/include/llapi/mc/Facing.hpp index 7c77973ff0..6df2ef64bf 100644 --- a/LiteLoader/include/llapi/mc/Facing.hpp +++ b/LiteLoader/include/llapi/mc/Facing.hpp @@ -70,6 +70,10 @@ enum class Axis : int; * @symbol ?FACINGMASK_INV\@Facing\@\@2QBEB */ MCAPI static unsigned char const FACINGMASK_INV[]; + /** + * @symbol ?FROM_STRING_MAP\@Facing\@\@2V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@EU?$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\@\@E\@std\@\@\@2\@\@std\@\@B + */ + MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> const FROM_STRING_MAP; /** * @symbol ?NORMAL\@Facing\@\@2QBVVec3\@\@B */ @@ -90,6 +94,10 @@ enum class Axis : int; * @symbol ?STEP_Z\@Facing\@\@2QBHB */ MCAPI static int const STEP_Z[]; + /** + * @symbol ?TO_STRING_ARR\@Facing\@\@2V?$array\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$05\@std\@\@B + */ + MCAPI static class std::array const TO_STRING_ARR; /** * @symbol ?convertDirectionToFacingDirection\@Facing\@\@SAEW4Type\@Direction\@\@\@Z */ @@ -134,10 +142,6 @@ enum class Axis : int; * @symbol ?getFaceLocation\@Facing\@\@SA?AVVec3\@\@EMM\@Z */ MCAPI static class Vec3 getFaceLocation(unsigned char, float, float); - /** - * @symbol ?getFaceLocationXY\@Facing\@\@SA?AVVec2\@\@EAEBVVec3\@\@\@Z - */ - MCAPI static class Vec2 getFaceLocationXY(unsigned char, class Vec3 const &); /** * @symbol ?getFacingDirection\@Facing\@\@SAEAEBVVec3\@\@0\@Z */ @@ -166,14 +170,14 @@ enum class Axis : int; * @symbol ?getRotationMatrix\@Facing\@\@SA?AU?$mat\@$02$02M$0A\@\@glm\@\@EW4Rotation\@1\@\@Z */ MCAPI static struct glm::mat<3, 3, float, 0> getRotationMatrix(unsigned char, enum class Facing::Rotation); - /** - * @symbol ?getShuffledDirections\@Facing\@\@SA?AV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@AEAVRandom\@\@\@Z - */ - MCAPI static std::vector getShuffledDirections(class Random &); /** * @symbol ?getShuffledDirections\@Facing\@\@SA?AV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@XZ */ MCAPI static std::vector getShuffledDirections(); + /** + * @symbol ?getShuffledDirections\@Facing\@\@SA?AV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@AEAVRandom\@\@\@Z + */ + MCAPI static std::vector getShuffledDirections(class Random &); /** * @symbol ?getStepX\@Facing\@\@SAHE\@Z */ diff --git a/LiteLoader/include/llapi/mc/FallingBlock.hpp b/LiteLoader/include/llapi/mc/FallingBlock.hpp index 5d83c10a3a..8840777bce 100644 --- a/LiteLoader/include/llapi/mc/FallingBlock.hpp +++ b/LiteLoader/include/llapi/mc/FallingBlock.hpp @@ -5,8 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Actor.hpp" -#include "PredictableProjectile.hpp" +#include "BlockLegacy.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -17,7 +16,7 @@ * @brief MC class FallingBlock. * */ -class FallingBlock : public PredictableProjectile { +class FallingBlock : public BlockLegacy { #define AFTER_EXTRA // Add Member There @@ -32,207 +31,279 @@ class FallingBlock : public PredictableProjectile { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@FallingBlock\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); + virtual void __unk_vfn_0(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 19 + * @symbol __unk_vfn_19 */ - virtual void __unk_vfn_16(); + 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(); + /** + * @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 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 43 + * @symbol __unk_vfn_43 + */ + virtual void __unk_vfn_43(); /** * @vftbl 44 - * @symbol ?teleportTo\@FallingBlock\@\@UEAAXAEBVVec3\@\@_NHH1\@Z + * @symbol __unk_vfn_44 */ - virtual void teleportTo(class Vec3 const &, bool, int, int, bool); + virtual void __unk_vfn_44(); /** - * @vftbl 49 - * @symbol ?normalTick\@FallingBlock\@\@UEAAXXZ + * @vftbl 45 + * @symbol __unk_vfn_45 */ - virtual void normalTick(); + virtual void __unk_vfn_45(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 46 + * @symbol __unk_vfn_46 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_46(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 47 + * @symbol __unk_vfn_47 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_47(); /** - * @vftbl 79 - * @symbol ?getShadowHeightOffs\@FallingBlock\@\@UEAAMXZ + * @vftbl 48 + * @symbol __unk_vfn_48 */ - virtual float getShadowHeightOffs(); + virtual void __unk_vfn_48(); /** - * @vftbl 80 - * @symbol ?getShadowRadius\@FallingBlock\@\@UEBAMXZ + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual float getShadowRadius() const; + virtual void __unk_vfn_53(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_59(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 60 + * @symbol __unk_vfn_60 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_60(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_74(); /** - * @vftbl 95 - * @symbol ?isPickable\@FallingBlock\@\@UEAA_NXZ + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual bool isPickable(); + virtual void __unk_vfn_81(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 98 + * @symbol ?neighborChanged\@FallingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ - virtual void __unk_vfn_96(); + virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_122(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 123 + * @symbol __unk_vfn_123 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_123(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_124(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_127(); /** - * @vftbl 177 - * @symbol ?canChangeDimensionsUsingPortal\@FallingBlock\@\@UEBA_NXZ + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual bool canChangeDimensionsUsingPortal() const; + virtual void __unk_vfn_130(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 150 + * @symbol ?animateTick\@FallingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ - virtual void __unk_vfn_178(); + virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 182 - * @symbol ?causeFallDamage\@FallingBlock\@\@UEAAXMMVActorDamageSource\@\@\@Z + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void causeFallDamage(float, float, class ActorDamageSource); + virtual void __unk_vfn_155(); /** - * @vftbl 187 - * @symbol ?onSynchedDataUpdate\@FallingBlock\@\@UEAAXH\@Z + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void onSynchedDataUpdate(int); + virtual void __unk_vfn_164(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_165(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_166(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 167 + * @symbol ?onPlace\@FallingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_218(); + virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_169(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 170 + * @symbol ?tick\@FallingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ - virtual void __unk_vfn_243(); + virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_173(); /** - * @vftbl 261 - * @symbol ?_hurt\@FallingBlock\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); + virtual void __unk_vfn_177(); /** - * @vftbl 264 - * @symbol ?readAdditionalSaveData\@FallingBlock\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); + virtual void __unk_vfn_186(); /** - * @vftbl 265 - * @symbol ?addAdditionalSaveData\@FallingBlock\@\@MEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 194 + * @symbol ?getDustColor\@DragonEggBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ - virtual void addAdditionalSaveData(class CompoundTag &) const; + virtual class mce::Color getDustColor(class Block const &) const = 0; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 195 + * @symbol ?getDustParticleName\@DragonEggBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ - virtual void __unk_vfn_268(); -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FALLINGBLOCK + virtual std::string getDustParticleName(class Block const &) const = 0; /** - * @symbol ?getDeletionDelayTimeSeconds\@FallingBlock\@\@UEBAMXZ + * @vftbl 196 + * @symbol __unk_vfn_196 */ - MCVAPI float getDeletionDelayTimeSeconds() const; -#endif + virtual void __unk_vfn_196(); + /** + * @vftbl 197 + * @symbol ?onLand\@FallingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + virtual void onLand(class BlockSource &, class BlockPos const &) const; /** - * @symbol ??0FallingBlock\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @vftbl 198 + * @symbol ?isFreeToFall\@FallingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ - MCAPI FallingBlock(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); + virtual bool isFreeToFall(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?breakBlock\@FallingBlock\@\@QEAAXXZ + * @vftbl 199 + * @symbol ?startFalling\@FallingBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@_N\@Z */ - MCAPI void breakBlock(); + virtual void startFalling(class BlockSource &, class BlockPos const &, class Block const &, bool) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FALLINGBLOCK /** - * @symbol ?doNormalTick\@FallingBlock\@\@QEAAXAEAVITickDelegate\@\@\@Z + * @symbol ?falling\@FallingBlock\@\@UEBA_NXZ */ - MCAPI void doNormalTick(class ITickDelegate &); + MCVAPI bool falling() const; /** - * @symbol ?getFallingBlock\@FallingBlock\@\@QEBAAEBVBlock\@\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI class Block const & getFallingBlock() const; + MCVAPI ~FallingBlock(); +#endif /** - * @symbol ?setFallDamageAmount\@FallingBlock\@\@QEAAXM\@Z + * @symbol ??0FallingBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ - MCAPI void setFallDamageAmount(float); + MCAPI FallingBlock(std::string const &, int, class Material const &); /** - * @symbol ?setFallingBlock\@FallingBlock\@\@QEAAXAEBVBlock\@\@_N\@Z + * @symbol ?triggerFallCheck\@FallingBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ - MCAPI void setFallingBlock(class Block const &, bool); + MCAPI void triggerFallCheck(class BlockSource &, class BlockPos const &) const; -//private: +//protected: + /** + * @symbol ?_tickBlocksAround2D\@FallingBlock\@\@IEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + */ + MCAPI void _tickBlocksAround2D(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @symbol ?_waitRemoval\@FallingBlock\@\@AEAAXXZ + * @symbol ?checkSlide\@FallingBlock\@\@IEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ - MCAPI void _waitRemoval(); + MCAPI void checkSlide(class BlockSource &, class BlockPos const &) const; -private: +protected: }; diff --git a/LiteLoader/include/llapi/mc/FallingBlockActor.hpp b/LiteLoader/include/llapi/mc/FallingBlockActor.hpp new file mode 100644 index 0000000000..42ff5c3e7e --- /dev/null +++ b/LiteLoader/include/llapi/mc/FallingBlockActor.hpp @@ -0,0 +1,228 @@ +/** + * @file FallingBlockActor.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Actor.hpp" +#include "PredictableProjectile.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class FallingBlockActor : public PredictableProjectile { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_FALLINGBLOCKACTOR +public: + class FallingBlockActor& operator=(class FallingBlockActor const &) = delete; + FallingBlockActor(class FallingBlockActor const &) = delete; + FallingBlockActor() = delete; +#endif + +public: + /** + * @vftbl 10 + * @symbol ?reloadHardcoded\@FallingBlockActor\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + */ + virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); + /** + * @vftbl 16 + * @symbol __unk_vfn_16 + */ + virtual void __unk_vfn_16(); + /** + * @vftbl 40 + * @symbol __unk_vfn_40 + */ + virtual void __unk_vfn_40(); + /** + * @vftbl 43 + * @symbol ?teleportTo\@FallingBlockActor\@\@UEAAXAEBVVec3\@\@_NHH1\@Z + */ + virtual void teleportTo(class Vec3 const &, bool, int, int, bool); + /** + * @vftbl 48 + * @symbol ?normalTick\@FallingBlockActor\@\@UEAAXXZ + */ + virtual void normalTick(); + /** + * @vftbl 61 + * @symbol __unk_vfn_61 + */ + virtual void __unk_vfn_61(); + /** + * @vftbl 68 + * @symbol __unk_vfn_68 + */ + virtual void __unk_vfn_68(); + /** + * @vftbl 77 + * @symbol ?getShadowHeightOffs\@FallingBlockActor\@\@UEAAMXZ + */ + virtual float getShadowHeightOffs(); + /** + * @vftbl 78 + * @symbol ?getShadowRadius\@FallingBlockActor\@\@UEBAMXZ + */ + virtual float getShadowRadius() const; + /** + * @vftbl 80 + * @symbol __unk_vfn_80 + */ + virtual void __unk_vfn_80(); + /** + * @vftbl 86 + * @symbol __unk_vfn_86 + */ + virtual void __unk_vfn_86(); + /** + * @vftbl 93 + * @symbol ?isPickable\@FallingBlockActor\@\@UEAA_NXZ + */ + virtual bool isPickable(); + /** + * @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 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 106 + * @symbol __unk_vfn_106 + */ + virtual void __unk_vfn_106(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); + /** + * @vftbl 109 + * @symbol __unk_vfn_109 + */ + virtual void __unk_vfn_109(); + /** + * @vftbl 175 + * @symbol ?canChangeDimensionsUsingPortal\@FallingBlockActor\@\@UEBA_NXZ + */ + virtual bool canChangeDimensionsUsingPortal() const; + /** + * @vftbl 176 + * @symbol __unk_vfn_176 + */ + virtual void __unk_vfn_176(); + /** + * @vftbl 180 + * @symbol ?causeFallDamage\@FallingBlockActor\@\@UEAAXMMVActorDamageSource\@\@\@Z + */ + virtual void causeFallDamage(float, float, class ActorDamageSource); + /** + * @vftbl 185 + * @symbol ?onSynchedDataUpdate\@FallingBlockActor\@\@UEAAXH\@Z + */ + virtual void onSynchedDataUpdate(int); + /** + * @vftbl 190 + * @symbol __unk_vfn_190 + */ + virtual void __unk_vfn_190(); + /** + * @vftbl 215 + * @symbol __unk_vfn_215 + */ + virtual void __unk_vfn_215(); + /** + * @vftbl 216 + * @symbol __unk_vfn_216 + */ + virtual void __unk_vfn_216(); + /** + * @vftbl 232 + * @symbol __unk_vfn_232 + */ + virtual void __unk_vfn_232(); + /** + * @vftbl 235 + * @symbol __unk_vfn_235 + */ + virtual void __unk_vfn_235(); + /** + * @vftbl 252 + * @symbol __unk_vfn_252 + */ + virtual void __unk_vfn_252(); + /** + * @vftbl 253 + * @symbol ?_hurt\@FallingBlockActor\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + */ + virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); + /** + * @vftbl 256 + * @symbol ?readAdditionalSaveData\@FallingBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + */ + virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); + /** + * @vftbl 257 + * @symbol ?addAdditionalSaveData\@FallingBlockActor\@\@MEBAXAEAVCompoundTag\@\@\@Z + */ + virtual void addAdditionalSaveData(class CompoundTag &) const; + /** + * @vftbl 260 + * @symbol __unk_vfn_260 + */ + virtual void __unk_vfn_260(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FALLINGBLOCKACTOR + /** + * @symbol ?getDeletionDelayTimeSeconds\@FallingBlockActor\@\@UEBAMXZ + */ + MCVAPI float getDeletionDelayTimeSeconds() const; +#endif + /** + * @symbol ??0FallingBlockActor\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + */ + MCAPI FallingBlockActor(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); + /** + * @symbol ?breakBlock\@FallingBlockActor\@\@QEAAXXZ + */ + MCAPI void breakBlock(); + /** + * @symbol ?doNormalTick\@FallingBlockActor\@\@QEAAXAEAVITickDelegate\@\@\@Z + */ + MCAPI void doNormalTick(class ITickDelegate &); + /** + * @symbol ?getFallingBlock\@FallingBlockActor\@\@QEBAAEBVBlock\@\@XZ + */ + MCAPI class Block const & getFallingBlock() const; + /** + * @symbol ?setFallDamageAmount\@FallingBlockActor\@\@QEAAXM\@Z + */ + MCAPI void setFallDamageAmount(float); + /** + * @symbol ?setFallingBlock\@FallingBlockActor\@\@QEAAXAEBVBlock\@\@_N\@Z + */ + MCAPI void setFallingBlock(class Block const &, bool); + +//private: + /** + * @symbol ?_waitRemoval\@FallingBlockActor\@\@AEAAXXZ + */ + MCAPI void _waitRemoval(); + +private: + +}; diff --git a/LiteLoader/include/llapi/mc/FarmBlock.hpp b/LiteLoader/include/llapi/mc/FarmBlock.hpp index d1e62b2340..738104fd97 100644 --- a/LiteLoader/include/llapi/mc/FarmBlock.hpp +++ b/LiteLoader/include/llapi/mc/FarmBlock.hpp @@ -45,16 +45,26 @@ class FarmBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); + /** + * @vftbl 22 + * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +76,10 @@ class FarmBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +111,10 @@ class FarmBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,15 +141,15 @@ class FarmBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -147,126 +157,126 @@ class FarmBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@FarmBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 72 + * @vftbl 71 * @symbol ?transformOnFall\@FarmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@M\@Z */ virtual void transformOnFall(class BlockSource &, class BlockPos const &, class Actor *, float) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@FarmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@FarmBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 161 + * @symbol ?onRemove\@FarmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_166(); + virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_164(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_165(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_166(); /** - * @vftbl 172 + * @vftbl 169 + * @symbol __unk_vfn_169 + */ + virtual void __unk_vfn_169(); + /** + * @vftbl 170 * @symbol ?tick\@FarmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 + * @vftbl 171 * @symbol ?randomTick\@FarmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@FarmBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@FarmBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/FeatureRegistryPacket.hpp b/LiteLoader/include/llapi/mc/FeatureRegistryPacket.hpp index 637f35af97..179f44af1e 100644 --- a/LiteLoader/include/llapi/mc/FeatureRegistryPacket.hpp +++ b/LiteLoader/include/llapi/mc/FeatureRegistryPacket.hpp @@ -51,9 +51,9 @@ class FeatureRegistryPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@FeatureRegistryPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@FeatureRegistryPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 72bf440d02..e95cba5229 100644 --- a/LiteLoader/include/llapi/mc/FeedItem.hpp +++ b/LiteLoader/include/llapi/mc/FeedItem.hpp @@ -40,14 +40,14 @@ struct Effect { * @symbol ?addEffect\@FeedItem\@\@QEAAXAEBUEffect\@1\@\@Z */ MCAPI void addEffect(struct FeedItem::Effect const &); - /** - * @symbol ??4FeedItem\@\@QEAAAEAU0\@AEBU0\@\@Z - */ - MCAPI struct FeedItem & operator=(struct FeedItem const &); /** * @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 28a1e78ca9..1c507f8788 100644 --- a/LiteLoader/include/llapi/mc/FenceBlock.hpp +++ b/LiteLoader/include/llapi/mc/FenceBlock.hpp @@ -65,16 +65,21 @@ class FenceBlock : public BlockLegacy { * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -86,10 +91,10 @@ class FenceBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -121,10 +126,10 @@ class FenceBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -151,15 +156,15 @@ class FenceBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -167,124 +172,124 @@ class FenceBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@FenceBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@FenceBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 96 + * @vftbl 95 * @symbol ?breaksFallingBlocks\@FenceBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@FenceBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 143 + * @vftbl 141 * @symbol ?getVisualShapeInWorld\@FenceBlock\@\@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 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 + */ + virtual void __unk_vfn_155(); + /** + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + 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 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_169(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_173(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 174 + * @symbol ?clip\@FenceBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z */ - virtual void __unk_vfn_175(); + virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@FenceBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #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 29ad86b8e2..5bcd509d31 100644 --- a/LiteLoader/include/llapi/mc/FenceGateBlock.hpp +++ b/LiteLoader/include/llapi/mc/FenceGateBlock.hpp @@ -55,16 +55,21 @@ class FenceGateBlock : public BlockLegacy { * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -76,10 +81,10 @@ class FenceGateBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -111,10 +116,10 @@ class FenceGateBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -141,15 +146,15 @@ class FenceGateBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -157,84 +162,89 @@ class FenceGateBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@FenceGateBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 73 + * @vftbl 72 * @symbol ?onRedstoneUpdate\@FenceGateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@FenceGateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 85 + * @vftbl 84 * @symbol ?ignoreEntitiesOnPistonMove\@FenceGateBlock\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool ignoreEntitiesOnPistonMove(class Block const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@FenceGateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_164(); + /** + * @vftbl 165 + * @symbol __unk_vfn_165 + */ + virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -242,49 +252,39 @@ class FenceGateBlock : public BlockLegacy { 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 ?onPlace\@FenceGateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@FenceGateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@FenceGateBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #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 94183285f0..38490ee4d4 100644 --- a/LiteLoader/include/llapi/mc/FertilizerItem.hpp +++ b/LiteLoader/include/llapi/mc/FertilizerItem.hpp @@ -36,11 +36,6 @@ class FertilizerItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 10 * @symbol ?executeEvent\@FertilizerItem\@\@UEBAXAEAVItemStackBase\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVRenderParams\@\@\@Z @@ -61,6 +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 @@ -117,7 +117,17 @@ class FertilizerItem : public Item { */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 132 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 134 * @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; diff --git a/LiteLoader/include/llapi/mc/FillingContainer.hpp b/LiteLoader/include/llapi/mc/FillingContainer.hpp index 7d956a7171..cc96118a7d 100644 --- a/LiteLoader/include/llapi/mc/FillingContainer.hpp +++ b/LiteLoader/include/llapi/mc/FillingContainer.hpp @@ -60,57 +60,57 @@ class FillingContainer : public Container { */ virtual void removeItem(int, int); /** - * @vftbl 15 + * @vftbl 16 * @symbol ?getContainerSize\@FillingContainer\@\@UEBAHXZ */ virtual int getContainerSize() const; /** - * @vftbl 16 + * @vftbl 17 * @symbol ?getMaxStackSize\@FillingContainer\@\@UEBAHXZ */ virtual int getMaxStackSize() const; /** - * @vftbl 17 + * @vftbl 18 * @symbol ?startOpen\@FillingContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void startOpen(class Player &); /** - * @vftbl 18 + * @vftbl 19 * @symbol ?stopOpen\@FillingContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void stopOpen(class Player &); - /** - * @vftbl 24 - * @symbol __unk_vfn_24 - */ - virtual void __unk_vfn_24(); /** * @vftbl 25 * @symbol __unk_vfn_25 */ virtual void __unk_vfn_25(); /** - * @vftbl 35 + * @vftbl 26 + * @symbol __unk_vfn_26 + */ + virtual void __unk_vfn_26(); + /** + * @vftbl 36 * @symbol ?add\@FillingContainer\@\@UEAA_NAEAVItemStack\@\@\@Z */ virtual bool add(class ItemStack &); /** - * @vftbl 36 + * @vftbl 37 * @symbol ?canAdd\@FillingContainer\@\@UEBA_NAEBVItemStack\@\@\@Z */ virtual bool canAdd(class ItemStack const &) const; /** - * @vftbl 37 + * @vftbl 38 * @symbol ?clearSlot\@FillingContainer\@\@UEAAXH\@Z */ virtual void clearSlot(int); /** - * @vftbl 38 + * @vftbl 39 * @symbol ?clearInventory\@FillingContainer\@\@UEAAHH\@Z */ virtual int clearInventory(int); /** - * @vftbl 39 + * @vftbl 40 * @symbol ?load\@FillingContainer\@\@UEAAXAEBVListTag\@\@AEBVSemVersion\@\@AEAVLevel\@\@\@Z */ virtual void load(class ListTag const &, class SemVersion const &, class Level &); diff --git a/LiteLoader/include/llapi/mc/FilterGroup.hpp b/LiteLoader/include/llapi/mc/FilterGroup.hpp index def6e9714b..28bfec98bc 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_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 ?addFilterTest\@FilterGroup\@\@QEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + MCAPI bool addFilterTest(struct FilterTest::Definition const &, struct FilterInputs const &); /** * @symbol ?empty\@FilterGroup\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/FilterStringMap.hpp b/LiteLoader/include/llapi/mc/FilterStringMap.hpp index 86e0d0d440..a96269010e 100644 --- a/LiteLoader/include/llapi/mc/FilterStringMap.hpp +++ b/LiteLoader/include/llapi/mc/FilterStringMap.hpp @@ -28,14 +28,14 @@ struct FilterStringMap { #endif public: - /** - * @symbol ??0FilterStringMap\@\@QEAA\@AEBU0\@\@Z - */ - MCAPI FilterStringMap(struct FilterStringMap const &); /** * @symbol ??0FilterStringMap\@\@QEAA\@V?$initializer_list\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UFilterInputDefinition\@\@\@std\@\@\@std\@\@\@Z */ MCAPI FilterStringMap(class std::initializer_list>); + /** + * @symbol ??0FilterStringMap\@\@QEAA\@AEBU0\@\@Z + */ + MCAPI FilterStringMap(struct FilterStringMap const &); /** * @symbol ??4FilterStringMap\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/FilterTest.hpp b/LiteLoader/include/llapi/mc/FilterTest.hpp index b5a6006323..665b8df9b0 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\@ActorInWeatherTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @symbol ?evaluate\@ActorInactivityTimerTest\@\@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\@ActorInWeatherTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ + * @symbol ?getName\@ActorInactivityTimerTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ */ virtual class std::basic_string_view> getName() const = 0; /** @@ -68,7 +68,7 @@ struct Definition { virtual class Json::Value _serializeDomain() const; /** * @vftbl 6 - * @symbol ?_serializeValue\@ActorInWeatherTest\@\@MEBA?AVValue\@Json\@\@XZ + * @symbol ?_serializeValue\@ActorHasAllSlotsEmptyTest\@\@MEBA?AVValue\@Json\@\@XZ */ virtual class Json::Value _serializeValue() const = 0; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FILTERTEST @@ -83,10 +83,6 @@ struct Definition { MCAPI class Json::Value serialize() const; //protected: - /** - * @symbol ?_testValuesWithOperator\@FilterTest\@\@IEBA_NHH\@Z - */ - MCAPI bool _testValuesWithOperator(int, int) const; /** * @symbol ?_testValuesWithOperator\@FilterTest\@\@IEBA_NMM\@Z */ @@ -95,6 +91,10 @@ struct Definition { * @symbol ?_testValuesWithOperator\@FilterTest\@\@IEBA_N_N0\@Z */ MCAPI bool _testValuesWithOperator(bool, bool) const; + /** + * @symbol ?_testValuesWithOperator\@FilterTest\@\@IEBA_NHH\@Z + */ + MCAPI bool _testValuesWithOperator(int, int) const; protected: diff --git a/LiteLoader/include/llapi/mc/FilterTestAltitude.hpp b/LiteLoader/include/llapi/mc/FilterTestAltitude.hpp index 07882cc0e4..452d38166d 100644 --- a/LiteLoader/include/llapi/mc/FilterTestAltitude.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestAltitude.hpp @@ -17,7 +17,7 @@ * @brief MC class FilterTestAltitude. * */ -class FilterTestAltitude { +class FilterTestAltitude : public FilterTest { #define AFTER_EXTRA // Add Member There @@ -36,36 +36,16 @@ class FilterTestAltitude { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?setup\@SimpleIntFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z - */ - virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** * @vftbl 2 * @symbol ?evaluate\@FilterTestAltitude\@\@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\@FilterTestAltitude\@\@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\@SimpleIntFilterTest\@\@MEBA?AVValue\@Json\@\@XZ - */ - virtual class Json::Value _serializeValue() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FILTERTESTALTITUDE /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/FilterTestBiome.hpp b/LiteLoader/include/llapi/mc/FilterTestBiome.hpp index dff9bc208a..fea1061e66 100644 --- a/LiteLoader/include/llapi/mc/FilterTestBiome.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestBiome.hpp @@ -17,7 +17,7 @@ * @brief MC class FilterTestBiome. * */ -class FilterTestBiome { +class FilterTestBiome : public FilterTest { #define AFTER_EXTRA // Add Member There @@ -36,36 +36,16 @@ class FilterTestBiome { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?setup\@SimpleIntFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z - */ - virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** * @vftbl 2 * @symbol ?evaluate\@FilterTestBiome\@\@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\@FilterTestBiome\@\@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\@SimpleIntFilterTest\@\@MEBA?AVValue\@Json\@\@XZ - */ - virtual class Json::Value _serializeValue() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FILTERTESTBIOME /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/FilterTestDifficulty.hpp b/LiteLoader/include/llapi/mc/FilterTestDifficulty.hpp index 0d8964584d..0a8d39e9e7 100644 --- a/LiteLoader/include/llapi/mc/FilterTestDifficulty.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestDifficulty.hpp @@ -17,7 +17,7 @@ * @brief MC class FilterTestDifficulty. * */ -class FilterTestDifficulty { +class FilterTestDifficulty : public FilterTest { #define AFTER_EXTRA // Add Member There @@ -36,36 +36,16 @@ class FilterTestDifficulty { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?setup\@SimpleIntFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z - */ - virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** * @vftbl 2 * @symbol ?evaluate\@FilterTestDifficulty\@\@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\@FilterTestDifficulty\@\@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\@SimpleIntFilterTest\@\@MEBA?AVValue\@Json\@\@XZ - */ - virtual class Json::Value _serializeValue() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FILTERTESTDIFFICULTY /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/FilterTestLightLevel.hpp b/LiteLoader/include/llapi/mc/FilterTestLightLevel.hpp index 09bb19817e..8d88b18d80 100644 --- a/LiteLoader/include/llapi/mc/FilterTestLightLevel.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestLightLevel.hpp @@ -17,7 +17,7 @@ * @brief MC class FilterTestLightLevel. * */ -class FilterTestLightLevel { +class FilterTestLightLevel : public FilterTest { #define AFTER_EXTRA // Add Member There @@ -36,35 +36,15 @@ class FilterTestLightLevel { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?setup\@SimpleIntFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z - */ - virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** * @vftbl 2 * @symbol ?evaluate\@FilterTestLightLevel\@\@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\@FilterTestLightLevel\@\@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\@SimpleIntFilterTest\@\@MEBA?AVValue\@Json\@\@XZ - */ - virtual class Json::Value _serializeValue() const; }; diff --git a/LiteLoader/include/llapi/mc/FilterTestTemperatureType.hpp b/LiteLoader/include/llapi/mc/FilterTestTemperatureType.hpp index 6f358cacfb..e4d5b48bcb 100644 --- a/LiteLoader/include/llapi/mc/FilterTestTemperatureType.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestTemperatureType.hpp @@ -17,7 +17,7 @@ * @brief MC class FilterTestTemperatureType. * */ -class FilterTestTemperatureType { +class FilterTestTemperatureType : public FilterTest { #define AFTER_EXTRA // Add Member There @@ -36,36 +36,16 @@ class FilterTestTemperatureType { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?setup\@SimpleIntFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z - */ - virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** * @vftbl 2 * @symbol ?evaluate\@FilterTestTemperatureType\@\@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\@FilterTestTemperatureType\@\@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\@SimpleIntFilterTest\@\@MEBA?AVValue\@Json\@\@XZ - */ - virtual class Json::Value _serializeValue() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FILTERTESTTEMPERATURETYPE /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/FilterTextPacket.hpp b/LiteLoader/include/llapi/mc/FilterTextPacket.hpp index eb9cc9502a..a5c5c0ce8a 100644 --- a/LiteLoader/include/llapi/mc/FilterTextPacket.hpp +++ b/LiteLoader/include/llapi/mc/FilterTextPacket.hpp @@ -51,9 +51,9 @@ class FilterTextPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@FilterTextPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@FilterTextPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FILTERTEXTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/FireBlock.hpp b/LiteLoader/include/llapi/mc/FireBlock.hpp index 71591e96ac..93b0497b2c 100644 --- a/LiteLoader/include/llapi/mc/FireBlock.hpp +++ b/LiteLoader/include/llapi/mc/FireBlock.hpp @@ -45,16 +45,21 @@ class FireBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class FireBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class FireBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,15 +136,15 @@ class FireBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -147,134 +152,129 @@ class FireBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@FireBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 69 + * @vftbl 68 * @symbol ?checkIsPathable\@FireBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 89 + * @vftbl 88 * @symbol ?mayPick\@FireBlock\@\@UEBA_NXZ */ virtual bool mayPick() const; /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@FireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@FireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 113 + * @vftbl 112 * @symbol ?entityInside\@FireBlock\@\@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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@FireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@FireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@FireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FIREBLOCK /** * @symbol ?canBeSilkTouched\@FireBlock\@\@MEBA_NXZ @@ -304,9 +304,9 @@ class FireBlock : public BlockLegacy { */ MCAPI void _tryAddToTickingQueue(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @symbol ?_trySpawnBlueFire\@FireBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_trySpawnSoulFire\@FireBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ - MCAPI bool _trySpawnBlueFire(class BlockSource &, class BlockPos const &) const; + MCAPI bool _trySpawnSoulFire(class BlockSource &, class BlockPos const &) const; /** * @symbol ?getFireOdds\@FireBlock\@\@AEBAMAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/FireChargeItem.hpp b/LiteLoader/include/llapi/mc/FireChargeItem.hpp index 0eacab3eb0..fe2309456b 100644 --- a/LiteLoader/include/llapi/mc/FireChargeItem.hpp +++ b/LiteLoader/include/llapi/mc/FireChargeItem.hpp @@ -36,11 +36,6 @@ class FireChargeItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class FireChargeItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -112,12 +112,22 @@ class FireChargeItem : public Item { */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 131 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 133 * @symbol ?_calculatePlacePos\@FireChargeItem\@\@EEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 132 + * @vftbl 134 * @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 8587b8984e..4280d9e0a3 100644 --- a/LiteLoader/include/llapi/mc/Fireball.hpp +++ b/LiteLoader/include/llapi/mc/Fireball.hpp @@ -37,167 +37,162 @@ class Fireball : public PredictableProjectile { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@Fireball\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 79 + * @vftbl 77 * @symbol ?getShadowHeightOffs\@Fireball\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** * @vftbl 85 - * @symbol __unk_vfn_85 - */ - virtual void __unk_vfn_85(); - /** - * @vftbl 87 * @symbol ?getBrightness\@Fireball\@\@UEBAMMAEBVIConstBlockSource\@\@\@Z */ virtual float getBrightness(float, class IConstBlockSource const &) const; /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_86(); /** - * @vftbl 95 + * @vftbl 93 * @symbol ?isPickable\@Fireball\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 + */ + virtual void __unk_vfn_94(); + /** + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 142 + * @vftbl 140 * @symbol ?getPickRadius\@Fireball\@\@UEAAMXZ */ virtual float getPickRadius(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?getSourceUniqueID\@Fireball\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 177 + * @vftbl 175 * @symbol ?canChangeDimensionsUsingPortal\@Fireball\@\@UEBA_NXZ */ virtual bool canChangeDimensionsUsingPortal() const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@Fireball\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@Fireball\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 276 + * @vftbl 268 * @symbol ?getInertia\@Fireball\@\@MEAAMXZ */ virtual float getInertia(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 269 + * @symbol __unk_vfn_269 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_269(); /** - * @vftbl 278 + * @vftbl 270 * @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 3204ee416a..5b2022d6bc 100644 --- a/LiteLoader/include/llapi/mc/FireworkChargeItem.hpp +++ b/LiteLoader/include/llapi/mc/FireworkChargeItem.hpp @@ -38,11 +38,6 @@ enum class Shape; * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -63,6 +58,11 @@ enum class Shape; * @symbol ?isDyeable\@FireworkChargeItem\@\@UEBA_NXZ */ virtual bool isDyeable() const; + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -125,9 +125,19 @@ enum class Shape; virtual void __unk_vfn_80(); /** * @vftbl 115 - * @symbol ?isSameItem\@FireworkChargeItem\@\@UEBA_NAEBVItemStackBase\@\@0\@Z + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 117 + * @symbol ?hasSameRelevantUserData\@FireworkChargeItem\@\@UEBA_NAEBVItemStackBase\@\@0\@Z */ - virtual bool isSameItem(class ItemStackBase const &, class ItemStackBase const &) const; + virtual bool hasSameRelevantUserData(class ItemStackBase const &, class ItemStackBase const &) const; /** * @symbol ??0FireworkChargeItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/FireworksItem.hpp b/LiteLoader/include/llapi/mc/FireworksItem.hpp index 561d013d58..4e3dcb59c8 100644 --- a/LiteLoader/include/llapi/mc/FireworksItem.hpp +++ b/LiteLoader/include/llapi/mc/FireworksItem.hpp @@ -36,11 +36,6 @@ class FireworksItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class FireworksItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -122,7 +122,17 @@ class FireworksItem : public Item { */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 132 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 134 * @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/FireworksRecipe.hpp b/LiteLoader/include/llapi/mc/FireworksRecipe.hpp index 46e8665dcf..14352710e5 100644 --- a/LiteLoader/include/llapi/mc/FireworksRecipe.hpp +++ b/LiteLoader/include/llapi/mc/FireworksRecipe.hpp @@ -37,9 +37,9 @@ class FireworksRecipe : public Recipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@FireworksRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z + * @symbol ?assemble\@FireworksRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEAVCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; + virtual std::vector const & assemble(class CraftingContainer &, class CraftingContext &) const; /** * @vftbl 2 * @symbol ?getCraftingSize\@FireworksRecipe\@\@UEBAHXZ @@ -62,9 +62,9 @@ class FireworksRecipe : public Recipe { virtual void __unk_vfn_5(); /** * @vftbl 6 - * @symbol ?matches\@FireworksRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @symbol ?matches\@FireworksRecipe\@\@UEBA_NAEBVCraftingContainer\@\@AEBVCraftingContext\@\@\@Z */ - virtual bool matches(class CraftingContainer &, class Level &) const; + virtual bool matches(class CraftingContainer const &, class CraftingContext const &) const; /** * @vftbl 7 * @symbol ?size\@FireworksRecipe\@\@UEBAHXZ diff --git a/LiteLoader/include/llapi/mc/FireworksRocketActor.hpp b/LiteLoader/include/llapi/mc/FireworksRocketActor.hpp index 35538199af..cc0c026978 100644 --- a/LiteLoader/include/llapi/mc/FireworksRocketActor.hpp +++ b/LiteLoader/include/llapi/mc/FireworksRocketActor.hpp @@ -37,135 +37,130 @@ class FireworksRocketActor : public PredictableProjectile { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 47 + * @vftbl 46 * @symbol ?lerpMotion\@FireworksRocketActor\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void lerpMotion(class Vec3 const &); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 80 + * @vftbl 78 * @symbol ?getShadowRadius\@FireworksRocketActor\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 141 + * @vftbl 139 * @symbol ?handleEntityEvent\@FireworksRocketActor\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 187 + * @vftbl 185 * @symbol ?onSynchedDataUpdate\@FireworksRocketActor\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@FireworksRocketActor\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@FireworksRocketActor\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** * @symbol ??0FireworksRocketActor\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/Fish.hpp b/LiteLoader/include/llapi/mc/Fish.hpp index 30e97d8ff5..abdb7f34c9 100644 --- a/LiteLoader/include/llapi/mc/Fish.hpp +++ b/LiteLoader/include/llapi/mc/Fish.hpp @@ -42,140 +42,135 @@ class Fish : public WaterAnimal { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 53 + * @vftbl 52 * @symbol ?startRiding\@Fish\@\@UEAA_NAEAVActor\@\@\@Z */ virtual bool startRiding(class Actor &); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 - */ - virtual void __unk_vfn_243(); - /** - * @vftbl 258 + * @vftbl 250 * @symbol ?updateEntitySpecificMolangVariables\@Fish\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); + /** + * @vftbl 252 + * @symbol __unk_vfn_252 + */ + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); - /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 331 + * @vftbl 323 * @symbol ?createAIGoals\@Fish\@\@UEAA_NXZ */ virtual bool createAIGoals(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); #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 2fa97e6468..d9baa39362 100644 --- a/LiteLoader/include/llapi/mc/FishingHook.hpp +++ b/LiteLoader/include/llapi/mc/FishingHook.hpp @@ -46,135 +46,130 @@ class FishingHook : public Actor { */ virtual void remove(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 80 + * @vftbl 78 * @symbol ?getShadowRadius\@FishingHook\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 141 + * @vftbl 139 * @symbol ?handleEntityEvent\@FishingHook\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?save\@FishingHook\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 169 + * @vftbl 167 * @symbol ?getSourceUniqueID\@FishingHook\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 177 + * @vftbl 175 * @symbol ?canChangeDimensionsUsingPortal\@FishingHook\@\@UEBA_NXZ */ virtual bool canChangeDimensionsUsingPortal() const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 246 + * @vftbl 238 * @symbol ?shouldDropDeathLoot\@FishingHook\@\@UEBA_NXZ */ virtual bool shouldDropDeathLoot() const; + /** + * @vftbl 252 + * @symbol __unk_vfn_252 + */ + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); - /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); /** * @symbol ??0FishingHook\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/FishingRodItem.hpp b/LiteLoader/include/llapi/mc/FishingRodItem.hpp index 66d7e02086..4dd5cbd62c 100644 --- a/LiteLoader/include/llapi/mc/FishingRodItem.hpp +++ b/LiteLoader/include/llapi/mc/FishingRodItem.hpp @@ -36,11 +36,6 @@ class FishingRodItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class FishingRodItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 49 * @symbol ?isHandEquipped\@FishingRodItem\@\@UEBA_NXZ @@ -137,20 +137,36 @@ class FishingRodItem : public Item { */ virtual bool mineBlock(class ItemStack &, class Block const &, int, int, int, class Actor *) const; /** - * @vftbl 118 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 120 * @symbol ?getIconInfo\@FishingRodItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 119 + * @vftbl 121 * @symbol ?getInteractText\@FishingRodItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPlayer\@\@\@Z */ virtual std::string getInteractText(class Player const &) const; /** - * @vftbl 120 + * @vftbl 122 * @symbol ?getAnimationFrameFor\@FishingRodItem\@\@UEBAHPEAVMob\@\@_NPEBVItemStack\@\@_N\@Z */ virtual int getAnimationFrameFor(class Mob *, bool, class ItemStack const *, bool) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FISHINGRODITEM + /** + * @symbol ?shouldSendInteractionGameEvents\@FishingRodItem\@\@UEBA_NXZ + */ + MCVAPI bool shouldSendInteractionGameEvents() const; +#endif /** * @symbol ??0FishingRodItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/FlintAndSteelItem.hpp b/LiteLoader/include/llapi/mc/FlintAndSteelItem.hpp index fc30443147..82ddcba780 100644 --- a/LiteLoader/include/llapi/mc/FlintAndSteelItem.hpp +++ b/LiteLoader/include/llapi/mc/FlintAndSteelItem.hpp @@ -36,11 +36,6 @@ class FlintAndSteelItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class FlintAndSteelItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -122,12 +122,22 @@ class FlintAndSteelItem : public Item { */ virtual void hurtActor(class ItemStack &, class Actor &, class Mob &) const; /** - * @vftbl 131 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 133 * @symbol ?_calculatePlacePos\@FlintAndSteelItem\@\@MEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 132 + * @vftbl 134 * @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/FloatTag.hpp b/LiteLoader/include/llapi/mc/FloatTag.hpp index d4e7ee60b8..f979eb6901 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 ?write\@FloatTag\@\@UEBAXAEAVIDataOutput\@\@\@Z + * @symbol __unk_vfn_2 */ - virtual void write(class IDataOutput &) const; + virtual void __unk_vfn_2(); /** * @vftbl 3 * @symbol ?load\@FloatTag\@\@UEAAXAEAVIDataInput\@\@\@Z @@ -79,6 +79,10 @@ 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 87b59309a7..f62f3837b4 100644 --- a/LiteLoader/include/llapi/mc/FlowerBlock.hpp +++ b/LiteLoader/include/llapi/mc/FlowerBlock.hpp @@ -5,7 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "BlockLegacy.hpp" +#include "BushBlock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +16,7 @@ * @brief MC class FlowerBlock. * */ -class FlowerBlock : public BlockLegacy { +class FlowerBlock : public BushBlock { #define AFTER_EXTRA // Add Member There @@ -50,16 +50,21 @@ class FlowerBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -71,10 +76,10 @@ class FlowerBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +111,10 @@ class FlowerBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,15 +141,15 @@ class FlowerBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -152,156 +157,151 @@ class FlowerBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@FlowerBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@FlowerBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@FlowerBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@FlowerBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 93 + * @vftbl 92 * @symbol ?mayPlaceOn\@FlowerBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@FlowerBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@FlowerBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 162 + * @vftbl 160 * @symbol ?_addHardCodedBlockComponents\@FlowerBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 181 + * @vftbl 179 * @symbol ?getRenderLayer\@FlowerBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 182 + * @vftbl 180 * @symbol ?getRenderLayer\@FlowerBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 + * @vftbl 185 * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@FlowerBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @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 ec3c2676c2..5a27a35b95 100644 --- a/LiteLoader/include/llapi/mc/FlowerPotBlock.hpp +++ b/LiteLoader/include/llapi/mc/FlowerPotBlock.hpp @@ -40,16 +40,21 @@ class FlowerPotBlock : public ActorBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class FlowerPotBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class FlowerPotBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,20 +131,20 @@ class FlowerPotBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** * @vftbl 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 55 * @symbol ?isValidAuxValue\@FlowerPotBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; + /** + * @vftbl 59 + * @symbol __unk_vfn_59 + */ + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -147,141 +152,136 @@ class FlowerPotBlock : public ActorBlock { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@FlowerPotBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 91 + * @vftbl 90 * @symbol ?mayPlace\@FlowerPotBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@FlowerPotBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@FlowerPotBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 101 + * @vftbl 100 * @symbol ?playerWillDestroy\@FlowerPotBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@FlowerPotBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@FlowerPotBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@FlowerPotBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@FlowerPotBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@FlowerPotBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @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 74d071ecbc..1e8357cd2b 100644 --- a/LiteLoader/include/llapi/mc/FlowerPotBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/FlowerPotBlockActor.hpp @@ -86,17 +86,17 @@ class FlowerPotBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); /** - * @vftbl 37 + * @vftbl 39 * @symbol ?_getUpdatePacket\@FlowerPotBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 38 + * @vftbl 40 * @symbol ?_onUpdatePacket\@FlowerPotBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/FlySpeedControlSystem.hpp b/LiteLoader/include/llapi/mc/FlySpeedControlSystem.hpp index e0d5a033e7..ab0132f507 100644 --- a/LiteLoader/include/llapi/mc/FlySpeedControlSystem.hpp +++ b/LiteLoader/include/llapi/mc/FlySpeedControlSystem.hpp @@ -10,26 +10,19 @@ #undef BEFORE_EXTRA -/** - * @brief MC class FlySpeedControlSystem. - * - */ -class FlySpeedControlSystem { + +namespace FlySpeedControlSystem { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_FLYSPEEDCONTROLSYSTEM -public: - class FlySpeedControlSystem& operator=(class FlySpeedControlSystem const &) = delete; - FlySpeedControlSystem(class FlySpeedControlSystem const &) = delete; - FlySpeedControlSystem() = delete; -#endif - -public: /** - * @symbol ?createFlySpeedControlSystem\@FlySpeedControlSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@FlySpeedControlSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI struct TickingSystemWithInfo createSystem(); + /** + * @symbol ?doFlySpeedControlSystem\@FlySpeedControlSystem\@\@YAXAEBVStrictEntityContext\@\@AEBUAbilitiesComponent\@\@AEBUMoveInputComponent\@\@AEBUActorGameTypeComponent\@\@AEAUFrictionModifierComponent\@\@AEAUStateVectorComponent\@\@AEBUExternalDataInterface\@\@\@Z */ - MCAPI static struct TickingSystemWithInfo createFlySpeedControlSystem(); + MCAPI void doFlySpeedControlSystem(class StrictEntityContext const &, struct AbilitiesComponent const &, struct MoveInputComponent const &, struct ActorGameTypeComponent const &, struct FrictionModifierComponent &, struct StateVectorComponent &, struct ExternalDataInterface const &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/FlyTriggerSystem.hpp b/LiteLoader/include/llapi/mc/FlyTriggerSystem.hpp index b9b5d143d9..244a730518 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\@\@SAXAEAVStrictEntityContext\@\@AEBUActorUniqueIDComponent\@\@AEBUAdventureSettingsComponent\@\@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\@\@\@\@V?$Optional\@UPlayerActionComponent\@\@\@\@AEAUAbilitiesComponent\@\@AEAUFallDistanceComponent\@\@AEAUPlayerInputRequestComponent\@\@AEAUSynchedActorDataComponent\@\@AEAUVanillaClientGameplayComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UVehicleComponent\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USendPacketsComponent\@\@\@\@\@Z */ - MCAPI static void tickEntity(class StrictEntityContext &, struct ActorUniqueIDComponent const &, struct AdventureSettingsComponent 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, class Optional, struct AbilitiesComponent &, struct FallDistanceComponent &, struct PlayerInputRequestComponent &, struct SynchedActorDataComponent &, struct VanillaClientGameplayComponent &, class ViewT>, class EntityModifierT); }; diff --git a/LiteLoader/include/llapi/mc/FrogSpawnBlock.hpp b/LiteLoader/include/llapi/mc/FrogSpawnBlock.hpp index cb6b5da43e..5daafdd7ea 100644 --- a/LiteLoader/include/llapi/mc/FrogSpawnBlock.hpp +++ b/LiteLoader/include/llapi/mc/FrogSpawnBlock.hpp @@ -48,16 +48,21 @@ class FrogSpawnBlock : public BlockLegacy { * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -69,10 +74,10 @@ class FrogSpawnBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -104,10 +109,10 @@ class FrogSpawnBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -134,150 +139,145 @@ class FrogSpawnBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 69 + * @vftbl 68 * @symbol ?checkIsPathable\@FrogSpawnBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 93 + * @vftbl 92 * @symbol ?mayPlaceOn\@FrogSpawnBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@FrogSpawnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 101 + * @vftbl 100 * @symbol ?playerWillDestroy\@FrogSpawnBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 113 + * @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 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@FrogSpawnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@FrogSpawnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@FrogSpawnBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FROGSPAWNBLOCK /** * @symbol ?canBeSilkTouched\@FrogSpawnBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/FrogSpawnBlockItem.hpp b/LiteLoader/include/llapi/mc/FrogSpawnBlockItem.hpp index 3fe904a8ee..998a19c40d 100644 --- a/LiteLoader/include/llapi/mc/FrogSpawnBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/FrogSpawnBlockItem.hpp @@ -34,11 +34,6 @@ class FrogSpawnBlockItem : public BlockItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -54,6 +49,11 @@ class FrogSpawnBlockItem : public BlockItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -105,12 +105,22 @@ class FrogSpawnBlockItem : public BlockItem { */ virtual void __unk_vfn_80(); /** - * @vftbl 131 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 133 * @symbol ?_calculatePlacePos\@FrogSpawnBlockItem\@\@UEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 132 + * @vftbl 134 * @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/FrostedIceBlock.hpp b/LiteLoader/include/llapi/mc/FrostedIceBlock.hpp index db4b6cd407..b5347f71c6 100644 --- a/LiteLoader/include/llapi/mc/FrostedIceBlock.hpp +++ b/LiteLoader/include/llapi/mc/FrostedIceBlock.hpp @@ -40,16 +40,21 @@ class FrostedIceBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class FrostedIceBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class FrostedIceBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,85 +131,90 @@ class FrostedIceBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 96 + * @vftbl 95 * @symbol ?breaksFallingBlocks\@FrostedIceBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 101 + * @vftbl 100 * @symbol ?playerWillDestroy\@FrostedIceBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@FrostedIceBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -212,46 +222,36 @@ class FrostedIceBlock : public BlockLegacy { 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 ?onPlace\@FrostedIceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@FrostedIceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 + * @vftbl 187 * @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/FuelItemComponent.hpp b/LiteLoader/include/llapi/mc/FuelItemComponent.hpp index a1248423d0..4c33d94fd5 100644 --- a/LiteLoader/include/llapi/mc/FuelItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/FuelItemComponent.hpp @@ -51,19 +51,22 @@ class FuelItemComponent { virtual void __unk_vfn_3(); /** * @vftbl 4 - * @symbol __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 * @symbol ?buildNetworkTag\@?$NetworkedItemComponent\@VFuelItemComponent\@\@\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 5 * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VFuelItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); + /** + * @symbol ??0FuelItemComponent\@\@QEAA\@PEAVComponentItem\@\@\@Z + */ + MCAPI FuelItemComponent(class ComponentItem *); + /** + * @symbol ?setFuelDuration\@FuelItemComponent\@\@QEAAXM\@Z + */ + MCAPI void setFuelDuration(float); /** * @symbol ?bindType\@FuelItemComponent\@\@SAXXZ */ diff --git a/LiteLoader/include/llapi/mc/FurnaceBlock.hpp b/LiteLoader/include/llapi/mc/FurnaceBlock.hpp index 29232ec8d8..30096fa87b 100644 --- a/LiteLoader/include/llapi/mc/FurnaceBlock.hpp +++ b/LiteLoader/include/llapi/mc/FurnaceBlock.hpp @@ -40,16 +40,21 @@ class FurnaceBlock : public ActorBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class FurnaceBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class FurnaceBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,152 +131,147 @@ class FurnaceBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@FurnaceBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 127 + * @vftbl 125 * @symbol ?getComparatorSignal\@FurnaceBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 150 + * @vftbl 148 * @symbol ?getMappedFace\@FurnaceBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@FurnaceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@FurnaceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@FurnaceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@FurnaceBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@FurnaceBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@FurnaceBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/FurnaceBlockActor.hpp b/LiteLoader/include/llapi/mc/FurnaceBlockActor.hpp index 986cc5f4e9..35c9046757 100644 --- a/LiteLoader/include/llapi/mc/FurnaceBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/FurnaceBlockActor.hpp @@ -195,6 +195,10 @@ class FurnaceBlockActor { * @symbol ?getBurnDuration\@FurnaceBlockActor\@\@SAMAEBVItemStackBase\@\@M\@Z */ MCAPI static float getBurnDuration(class ItemStackBase const &, float); + /** + * @symbol ?getItemBurnDuration\@FurnaceBlockActor\@\@SAMAEBVItem\@\@M\@Z + */ + MCAPI static float getItemBurnDuration(class Item const &, float); /** * @symbol ?getXPRewardFromSmeltingItems\@FurnaceBlockActor\@\@SAHAEBVItemStackBase\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/GameDataSaveTimer.hpp b/LiteLoader/include/llapi/mc/GameDataSaveTimer.hpp new file mode 100644 index 0000000000..0895c4fce0 --- /dev/null +++ b/LiteLoader/include/llapi/mc/GameDataSaveTimer.hpp @@ -0,0 +1,92 @@ +/** + * @file GameDataSaveTimer.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class GameDataSaveTimer { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_GAMEDATASAVETIMER +public: + class GameDataSaveTimer& operator=(class GameDataSaveTimer const &) = delete; + GameDataSaveTimer(class GameDataSaveTimer const &) = delete; + GameDataSaveTimer() = delete; +#endif + +public: + /** + * @symbol ??0GameDataSaveTimer\@\@QEAA\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@\@Z + */ + MCAPI GameDataSaveTimer(class std::chrono::duration<__int64, struct std::ratio<1, 1000000000>>); + /** + * @symbol ?areStorageActionsAllowed\@GameDataSaveTimer\@\@QEBA_NXZ + */ + MCAPI bool areStorageActionsAllowed() const; + /** + * @symbol ?calculateNextGameDataSaveTime\@GameDataSaveTimer\@\@QEBA?AV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@V234\@\@Z + */ + MCAPI class std::chrono::time_point>> calculateNextGameDataSaveTime(class std::chrono::time_point>>) const; + /** + * @symbol ?isNextGameDataSaveTimeSet\@GameDataSaveTimer\@\@QEBA_NXZ + */ + MCAPI bool isNextGameDataSaveTimeSet() const; + /** + * @symbol ?isTimeForGameDataSave\@GameDataSaveTimer\@\@QEBA_NV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z + */ + MCAPI bool isTimeForGameDataSave(class std::chrono::time_point>>) const; + /** + * @symbol ?isTimeForStorageCheck\@GameDataSaveTimer\@\@QEBA_NV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z + */ + MCAPI bool isTimeForStorageCheck(class std::chrono::time_point>>) const; + /** + * @symbol ?onAppSuspend\@GameDataSaveTimer\@\@QEAAXXZ + */ + MCAPI void onAppSuspend(); + /** + * @symbol ?onStartLeaveGame\@GameDataSaveTimer\@\@QEAAXXZ + */ + MCAPI void onStartLeaveGame(); + /** + * @symbol ?onUpdateAfterStorageDeferred\@GameDataSaveTimer\@\@QEAAXV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z + */ + MCAPI void onUpdateAfterStorageDeferred(class std::chrono::time_point>>); + /** + * @symbol ?requestTimedStorageDeferment\@GameDataSaveTimer\@\@QEAA?AV?$shared_ptr\@PEAX\@std\@\@XZ + */ + MCAPI class std::shared_ptr requestTimedStorageDeferment(); + /** + * @symbol ?setNextGameDataSaveTime\@GameDataSaveTimer\@\@QEAAXV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z + */ + MCAPI void setNextGameDataSaveTime(class std::chrono::time_point>>); + /** + * @symbol ?setNextStorageCheckTime\@GameDataSaveTimer\@\@QEAAXV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z + */ + MCAPI void setNextStorageCheckTime(class std::chrono::time_point>>); + /** + * @symbol ?setWasStorageSavePreviouslyDeferred\@GameDataSaveTimer\@\@QEAAX_N\@Z + */ + MCAPI void setWasStorageSavePreviouslyDeferred(bool); + /** + * @symbol ?wasStorageSavePreviouslyDeferred\@GameDataSaveTimer\@\@QEBA_NXZ + */ + MCAPI bool wasStorageSavePreviouslyDeferred() const; + /** + * @symbol ??1GameDataSaveTimer\@\@QEAA\@XZ + */ + MCAPI ~GameDataSaveTimer(); + /** + * @symbol ?calculateNextStorageCheckTime\@GameDataSaveTimer\@\@SA?AV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@V234\@\@Z + */ + MCAPI static class std::chrono::time_point>> calculateNextStorageCheckTime(class std::chrono::time_point>>); + +}; diff --git a/LiteLoader/include/llapi/mc/GameEventListenerComponent.hpp b/LiteLoader/include/llapi/mc/GameEventListenerComponent.hpp index 0552d2d4d5..059635be71 100644 --- a/LiteLoader/include/llapi/mc/GameEventListenerComponent.hpp +++ b/LiteLoader/include/llapi/mc/GameEventListenerComponent.hpp @@ -26,14 +26,14 @@ class GameEventListenerComponent { #endif public: - /** - * @symbol ??0GameEventListenerComponent\@\@QEAA\@XZ - */ - MCAPI GameEventListenerComponent(); /** * @symbol ??0GameEventListenerComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI GameEventListenerComponent(class GameEventListenerComponent &&); + /** + * @symbol ??0GameEventListenerComponent\@\@QEAA\@XZ + */ + MCAPI GameEventListenerComponent(); /** * @symbol ?initialize\@GameEventListenerComponent\@\@QEAA_NV?$unique_ptr\@VGameEventDynamicRegistration\@\@U?$default_delete\@VGameEventDynamicRegistration\@\@\@std\@\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/GameRule.hpp b/LiteLoader/include/llapi/mc/GameRule.hpp index b5fe4a75cc..842fda1b77 100644 --- a/LiteLoader/include/llapi/mc/GameRule.hpp +++ b/LiteLoader/include/llapi/mc/GameRule.hpp @@ -127,14 +127,14 @@ enum class Type : char{ MCAPI ~GameRule(); //protected: - /** - * @symbol ?_setDefaultValue\@GameRule\@\@IEAAAEAV1\@_N\@Z - */ - MCAPI class GameRule & _setDefaultValue(bool); /** * @symbol ?_setDefaultValue\@GameRule\@\@IEAAAEAV1\@H\@Z */ MCAPI class GameRule & _setDefaultValue(int); + /** + * @symbol ?_setDefaultValue\@GameRule\@\@IEAAAEAV1\@_N\@Z + */ + MCAPI class GameRule & _setDefaultValue(bool); //private: /** diff --git a/LiteLoader/include/llapi/mc/GameRules.hpp b/LiteLoader/include/llapi/mc/GameRules.hpp index 1021a96ab3..10f738e14c 100644 --- a/LiteLoader/include/llapi/mc/GameRules.hpp +++ b/LiteLoader/include/llapi/mc/GameRules.hpp @@ -28,14 +28,14 @@ class GameRules { #endif public: - /** - * @symbol ??0GameRules\@\@QEAA\@XZ - */ - MCAPI GameRules(); /** * @symbol ??0GameRules\@\@QEAA\@AEBV0\@\@Z */ MCAPI GameRules(class GameRules const &); + /** + * @symbol ??0GameRules\@\@QEAA\@XZ + */ + MCAPI GameRules(); /** * @symbol ?createAllGameRulesPacket\@GameRules\@\@QEBA?AV?$unique_ptr\@VGameRulesChangedPacket\@\@U?$default_delete\@VGameRulesChangedPacket\@\@\@std\@\@\@std\@\@XZ */ @@ -76,14 +76,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\@\@_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\@\@_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\@\@H_NPEA_N2PEAVValidationError\@GameRule\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/GameRulesChangedPacket.hpp b/LiteLoader/include/llapi/mc/GameRulesChangedPacket.hpp index 0f9e3473f3..c9ab6b9b47 100644 --- a/LiteLoader/include/llapi/mc/GameRulesChangedPacket.hpp +++ b/LiteLoader/include/llapi/mc/GameRulesChangedPacket.hpp @@ -52,8 +52,8 @@ class GameRulesChangedPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@GameRulesChangedPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@GameRulesChangedPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/GameSession.hpp b/LiteLoader/include/llapi/mc/GameSession.hpp index cc795ea86f..bdf7592745 100644 --- a/LiteLoader/include/llapi/mc/GameSession.hpp +++ b/LiteLoader/include/llapi/mc/GameSession.hpp @@ -34,6 +34,10 @@ class GameSession { * @symbol ??0GameSession\@\@QEAA\@AEAVNetworkSystem\@\@V?$unique_ptr\@VServerNetworkHandler\@\@U?$default_delete\@VServerNetworkHandler\@\@\@std\@\@\@std\@\@AEAVLoopbackPacketSender\@\@V?$unique_ptr\@VNetEventCallback\@\@U?$default_delete\@VNetEventCallback\@\@\@std\@\@\@3\@U?$pair\@V?$unique_ptr\@VLevel\@\@U?$default_delete\@VLevel\@\@\@std\@\@\@std\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@3\@W4SubClientId\@\@\@Z */ MCAPI GameSession(class NetworkSystem &, std::unique_ptr, class LoopbackPacketSender &, std::unique_ptr, struct std::pair, class OwnerPtrT>, enum class SubClientId); + /** + * @symbol ?earlyShutdownMainthread\@GameSession\@\@QEAAXXZ + */ + MCAPI void earlyShutdownMainthread(); /** * @symbol ?getServerNetworkHandler\@GameSession\@\@QEAA?AV?$NonOwnerPointer\@VServerNetworkHandler\@\@\@Bedrock\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/GameTestRequestPacket.hpp b/LiteLoader/include/llapi/mc/GameTestRequestPacket.hpp index b398c13e4c..1b8dbe3ff1 100644 --- a/LiteLoader/include/llapi/mc/GameTestRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/GameTestRequestPacket.hpp @@ -50,9 +50,9 @@ class GameTestRequestPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@GameTestRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@GameTestRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0GameTestRequestPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/GameTestResultsPacket.hpp b/LiteLoader/include/llapi/mc/GameTestResultsPacket.hpp index 01710ffd15..73c4622dc5 100644 --- a/LiteLoader/include/llapi/mc/GameTestResultsPacket.hpp +++ b/LiteLoader/include/llapi/mc/GameTestResultsPacket.hpp @@ -49,9 +49,9 @@ class GameTestResultsPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@GameTestResultsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@GameTestResultsPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 5e9a206d73..783a216282 100644 --- a/LiteLoader/include/llapi/mc/GameVersion.hpp +++ b/LiteLoader/include/llapi/mc/GameVersion.hpp @@ -35,14 +35,14 @@ class GameVersion { * @symbol ??0GameVersion\@\@QEAA\@IIIII\@Z */ MCAPI GameVersion(unsigned int, unsigned int, unsigned int, unsigned int, unsigned int); - /** - * @symbol ??0GameVersion\@\@QEAA\@AEBVListTag\@\@\@Z - */ - MCAPI GameVersion(class ListTag const &); /** * @symbol ??0GameVersion\@\@QEAA\@AEBV0\@\@Z */ MCAPI GameVersion(class GameVersion const &); + /** + * @symbol ??0GameVersion\@\@QEAA\@AEBVListTag\@\@\@Z + */ + MCAPI GameVersion(class ListTag const &); /** * @symbol ?asString\@GameVersion\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/GameplayUserManager.hpp b/LiteLoader/include/llapi/mc/GameplayUserManager.hpp index aef31bafb9..f54d704e1f 100644 --- a/LiteLoader/include/llapi/mc/GameplayUserManager.hpp +++ b/LiteLoader/include/llapi/mc/GameplayUserManager.hpp @@ -38,6 +38,14 @@ class GameplayUserManager { * @symbol ?addGameplayUser\@GameplayUserManager\@\@QEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z */ MCAPI void addGameplayUser(class OwnerPtrT); + /** + * @symbol ?cleanupRemovedGameplayUsers\@GameplayUserManager\@\@QEAAXXZ + */ + MCAPI void cleanupRemovedGameplayUsers(); + /** + * @symbol ?clearAllGameplayUserEntities\@GameplayUserManager\@\@QEAAXXZ + */ + MCAPI void clearAllGameplayUserEntities(); /** * @symbol ?forEachActiveGameplayUser\@GameplayUserManager\@\@QEBAXV?$function\@$$A6A_NAEAVEntityContext\@\@\@Z\@std\@\@\@Z */ @@ -47,21 +55,21 @@ class GameplayUserManager { */ MCAPI void forEachActivePlayer(class std::function) const; /** - * @symbol ?getActiveGameplayUserCount\@GameplayUserManager\@\@QEBA_KXZ + * @symbol ?forEachActivePlayerIncludeRemoved\@GameplayUserManager\@\@QEBAXV?$function\@$$A6A_NAEAVPlayer\@\@\@Z\@std\@\@\@Z */ - MCAPI unsigned __int64 getActiveGameplayUserCount() const; + MCAPI void forEachActivePlayerIncludeRemoved(class std::function) const; /** - * @symbol ?getActiveGameplayUsers\@GameplayUserManager\@\@QEAAAEAV?$vector\@VWeakEntityRef\@\@V?$allocator\@VWeakEntityRef\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getActiveGameplayUserCount\@GameplayUserManager\@\@QEBA_KXZ */ - MCAPI std::vector & getActiveGameplayUsers(); + MCAPI unsigned __int64 getActiveGameplayUserCount() const; /** * @symbol ?getActiveGameplayUsers\@GameplayUserManager\@\@QEBAAEBV?$vector\@VWeakEntityRef\@\@V?$allocator\@VWeakEntityRef\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getActiveGameplayUsers() const; /** - * @symbol ?getGameplayUserEntities\@GameplayUserManager\@\@QEAAAEAV?$vector\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@V?$allocator\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getActivePlayerCount\@GameplayUserManager\@\@QEBA_KXZ */ - MCAPI std::vector> & getGameplayUserEntities(); + MCAPI unsigned __int64 getActivePlayerCount() const; /** * @symbol ?getGameplayUserEntities\@GameplayUserManager\@\@QEBAAEBV?$vector\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@V?$allocator\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@std\@\@\@std\@\@XZ */ @@ -70,10 +78,6 @@ class GameplayUserManager { * @symbol ?getGameplayUserEntityCount\@GameplayUserManager\@\@QEBA_KXZ */ MCAPI unsigned __int64 getGameplayUserEntityCount() const; - /** - * @symbol ?getSuspendedGameplayUsers\@GameplayUserManager\@\@QEAAAEAV?$vector\@VWeakEntityRef\@\@V?$allocator\@VWeakEntityRef\@\@\@std\@\@\@std\@\@XZ - */ - MCAPI std::vector & getSuspendedGameplayUsers(); /** * @symbol ?initializeWithGameplayUserManagerProxy\@GameplayUserManager\@\@QEAAXV?$unique_ptr\@VGameplayUserManagerProxy\@\@U?$default_delete\@VGameplayUserManagerProxy\@\@\@std\@\@\@std\@\@\@Z */ @@ -90,10 +94,18 @@ class GameplayUserManager { * @symbol ?queueSuspendPlayer\@GameplayUserManager\@\@QEAAXAEBVEntityContext\@\@\@Z */ MCAPI void queueSuspendPlayer(class EntityContext const &); + /** + * @symbol ?registerAnyGameplayUsersRemovedCallback\@GameplayUserManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXXZ\@std\@\@\@Z + */ + MCAPI class Bedrock::PubSub::Subscription registerAnyGameplayUsersRemovedCallback(class std::function); /** * @symbol ?registerGameplayUserAddedCallback\@GameplayUserManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEAVEntityContext\@\@\@Z\@std\@\@\@Z */ MCAPI class Bedrock::PubSub::Subscription registerGameplayUserAddedCallback(class std::function); + /** + * @symbol ?registerGameplayUserRemovedCallback\@GameplayUserManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEAVEntityContext\@\@\@Z\@std\@\@\@Z + */ + MCAPI class Bedrock::PubSub::Subscription registerGameplayUserRemovedCallback(class std::function); /** * @symbol ?registerGameplayUserResumedCallback\@GameplayUserManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEBVEntityContext\@\@\@Z\@std\@\@\@Z */ @@ -102,12 +114,28 @@ class GameplayUserManager { * @symbol ?registerGameplayUserSuspendedCallback\@GameplayUserManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEBVEntityContext\@\@\@Z\@std\@\@\@Z */ MCAPI class Bedrock::PubSub::Subscription registerGameplayUserSuspendedCallback(class std::function); + /** + * @symbol ?registerLevelStorageManagerListener\@GameplayUserManager\@\@QEAAXAEAVLevelStorageManager\@\@\@Z + */ + MCAPI void registerLevelStorageManagerListener(class LevelStorageManager &); + /** + * @symbol ?shuffleActiveUsers\@GameplayUserManager\@\@QEAAXAEAVRandom\@\@\@Z + */ + MCAPI void shuffleActiveUsers(class Random &); + /** + * @symbol ?startLeaveGame\@GameplayUserManager\@\@QEAAXXZ + */ + MCAPI void startLeaveGame(); /** * @symbol ?tickSuspensions\@GameplayUserManager\@\@QEAAXXZ */ MCAPI void tickSuspensions(); //private: + /** + * @symbol ?_forActiveEachPlayer\@GameplayUserManager\@\@AEBAXV?$function\@$$A6A_NAEAVPlayer\@\@\@Z\@std\@\@_N\@Z + */ + MCAPI void _forActiveEachPlayer(class std::function, bool) const; /** * @symbol ?_getGameplayUserManagerProxy\@GameplayUserManager\@\@AEAAAEAVGameplayUserManagerProxy\@\@XZ */ @@ -116,6 +144,10 @@ class GameplayUserManager { * @symbol ?_getNewPlayerId\@GameplayUserManager\@\@AEBAHXZ */ MCAPI int _getNewPlayerId() const; + /** + * @symbol ?_saveAllPlayers\@GameplayUserManager\@\@AEAAXAEAVLevelStorage\@\@\@Z + */ + MCAPI void _saveAllPlayers(class LevelStorage &); private: diff --git a/LiteLoader/include/llapi/mc/GameplayUserManagerUtils.hpp b/LiteLoader/include/llapi/mc/GameplayUserManagerUtils.hpp new file mode 100644 index 0000000000..aba5251b7e --- /dev/null +++ b/LiteLoader/include/llapi/mc/GameplayUserManagerUtils.hpp @@ -0,0 +1,24 @@ +/** + * @file GameplayUserManagerUtils.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace GameplayUserManagerUtils { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?countUsersWithMatchingNetworkId\@GameplayUserManagerUtils\@\@YA_KAEBVGameplayUserManager\@\@AEBVNetworkIdentifier\@\@\@Z + */ + MCAPI unsigned __int64 countUsersWithMatchingNetworkId(class GameplayUserManager const &, class NetworkIdentifier const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/Ghast.hpp b/LiteLoader/include/llapi/mc/Ghast.hpp index 3d066a6691..986ba88203 100644 --- a/LiteLoader/include/llapi/mc/Ghast.hpp +++ b/LiteLoader/include/llapi/mc/Ghast.hpp @@ -42,142 +42,137 @@ class Ghast : public Monster { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 - */ - virtual void __unk_vfn_243(); - /** - * @vftbl 258 + * @vftbl 250 * @symbol ?updateEntitySpecificMolangVariables\@Ghast\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@Ghast\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 337 + * @vftbl 329 * @symbol ?_getWalkTargetValue\@Ghast\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** - * @vftbl 353 + * @vftbl 345 * @symbol ?isDarkEnoughToSpawn\@Ghast\@\@UEBA_NXZ */ virtual bool isDarkEnoughToSpawn() const; diff --git a/LiteLoader/include/llapi/mc/GildedBlackstone.hpp b/LiteLoader/include/llapi/mc/GildedBlackstoneBlock.hpp similarity index 50% rename from LiteLoader/include/llapi/mc/GildedBlackstone.hpp rename to LiteLoader/include/llapi/mc/GildedBlackstoneBlock.hpp index 4ce43e6ef5..10916bb2d3 100644 --- a/LiteLoader/include/llapi/mc/GildedBlackstone.hpp +++ b/LiteLoader/include/llapi/mc/GildedBlackstoneBlock.hpp @@ -1,5 +1,5 @@ /** - * @file GildedBlackstone.hpp + * @file GildedBlackstoneBlock.hpp * */ #pragma once @@ -8,25 +8,20 @@ #include "BlockLegacy.hpp" #define BEFORE_EXTRA -// Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC class GildedBlackstone. - * - */ -class GildedBlackstone : public BlockLegacy { + +class GildedBlackstoneBlock : public BlockLegacy { #define AFTER_EXTRA -// Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_GILDEDBLACKSTONE +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_GILDEDBLACKSTONEBLOCK public: - class GildedBlackstone& operator=(class GildedBlackstone const &) = delete; - GildedBlackstone(class GildedBlackstone const &) = delete; - GildedBlackstone() = delete; + class GildedBlackstoneBlock& operator=(class GildedBlackstoneBlock const &) = delete; + GildedBlackstoneBlock(class GildedBlackstoneBlock const &) = delete; + GildedBlackstoneBlock() = delete; #endif public: @@ -40,16 +35,21 @@ class GildedBlackstone : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +61,10 @@ class GildedBlackstone : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +96,10 @@ class GildedBlackstone : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,118 +126,113 @@ class GildedBlackstone : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 - * @symbol ?getResourceItem\@GildedBlackstone\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@GildedBlackstoneBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 - * @symbol ?getSilkTouchItemInstance\@GildedBlackstone\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@GildedBlackstoneBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0GildedBlackstone\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0GildedBlackstoneBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ - MCAPI GildedBlackstone(std::string const &, int, class Material const &); + MCAPI GildedBlackstoneBlock(std::string const &, int, class Material const &); }; diff --git a/LiteLoader/include/llapi/mc/GlassBlock.hpp b/LiteLoader/include/llapi/mc/GlassBlock.hpp index 4632bc040f..ea9bf19806 100644 --- a/LiteLoader/include/llapi/mc/GlassBlock.hpp +++ b/LiteLoader/include/llapi/mc/GlassBlock.hpp @@ -45,16 +45,21 @@ class GlassBlock : public BlockLegacy { * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class GlassBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class GlassBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,117 +136,112 @@ class GlassBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 66 + * @vftbl 65 * @symbol ?canBeUsedInCommands\@GlassBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 96 + * @vftbl 95 * @symbol ?breaksFallingBlocks\@GlassBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 190 + * @vftbl 189 * @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 76aa4e4d04..611e958bfe 100644 --- a/LiteLoader/include/llapi/mc/GlazedTerracottaBlock.hpp +++ b/LiteLoader/include/llapi/mc/GlazedTerracottaBlock.hpp @@ -40,16 +40,21 @@ class GlazedTerracottaBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class GlazedTerracottaBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class GlazedTerracottaBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,115 +131,110 @@ class GlazedTerracottaBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** * @vftbl 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 55 * @symbol ?isValidAuxValue\@GlazedTerracottaBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; + /** + * @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 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** * @vftbl 105 - * @symbol __unk_vfn_105 - */ - virtual void __unk_vfn_105(); - /** - * @vftbl 106 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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/GlideInputSystem.hpp b/LiteLoader/include/llapi/mc/GlideInputSystem.hpp index 722373c0e1..5d6b471412 100644 --- a/LiteLoader/include/llapi/mc/GlideInputSystem.hpp +++ b/LiteLoader/include/llapi/mc/GlideInputSystem.hpp @@ -31,5 +31,9 @@ class GlideInputSystem { * @symbol ?createGlideInputSystem\@GlideInputSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createGlideInputSystem(); + /** + * @symbol ?doGlideInputSystem\@GlideInputSystem\@\@SAXAEBUAbilitiesComponent\@\@AEBUFallFlyTicksComponent\@\@AEBUMoveInputComponent\@\@AEBUSynchedActorDataComponent\@\@AEAUStateVectorComponent\@\@\@Z + */ + MCAPI static void doGlideInputSystem(struct AbilitiesComponent const &, struct FallFlyTicksComponent const &, struct MoveInputComponent const &, struct SynchedActorDataComponent const &, struct StateVectorComponent &); }; diff --git a/LiteLoader/include/llapi/mc/GlowItemFrameBlock.hpp b/LiteLoader/include/llapi/mc/GlowItemFrameBlock.hpp index 3635c7f9f2..07c4857220 100644 --- a/LiteLoader/include/llapi/mc/GlowItemFrameBlock.hpp +++ b/LiteLoader/include/llapi/mc/GlowItemFrameBlock.hpp @@ -40,16 +40,21 @@ class GlowItemFrameBlock : public ItemFrameBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class GlowItemFrameBlock : public ItemFrameBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class GlowItemFrameBlock : public ItemFrameBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,107 +131,102 @@ class GlowItemFrameBlock : public ItemFrameBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 196 + * @vftbl 195 * @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 90e255d625..4897fd32c6 100644 --- a/LiteLoader/include/llapi/mc/GlowItemFrameBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/GlowItemFrameBlockActor.hpp @@ -71,10 +71,10 @@ class GlowItemFrameBlockActor : public ItemFrameBlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); /** * @symbol ??0GlowItemFrameBlockActor\@\@QEAA\@VBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/GlowLichenBlock.hpp b/LiteLoader/include/llapi/mc/GlowLichenBlock.hpp index 1ca830788d..d45ac3c08f 100644 --- a/LiteLoader/include/llapi/mc/GlowLichenBlock.hpp +++ b/LiteLoader/include/llapi/mc/GlowLichenBlock.hpp @@ -40,16 +40,21 @@ class GlowLichenBlock : public MultifaceBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class GlowLichenBlock : public MultifaceBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class GlowLichenBlock : public MultifaceBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,137 +131,132 @@ class GlowLichenBlock : public MultifaceBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@GlowLichenBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@GlowLichenBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 153 + * @vftbl 151 * @symbol ?init\@GlowLichenBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 + * @vftbl 187 * @symbol ?playerDestroy\@GlowLichenBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@GlowLichenBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 195 + * @vftbl 194 * @symbol ?getMultifaceBlock\@GlowLichenBlock\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getMultifaceBlock() const; /** - * @vftbl 196 + * @vftbl 195 * @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 c7607c52c3..af05fee2e2 100644 --- a/LiteLoader/include/llapi/mc/GlowSquid.hpp +++ b/LiteLoader/include/llapi/mc/GlowSquid.hpp @@ -37,147 +37,142 @@ class GlowSquid : public Squid { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@GlowSquid\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 141 + * @vftbl 139 * @symbol ?handleEntityEvent\@GlowSquid\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@GlowSquid\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 337 + * @vftbl 329 * @symbol ?_getWalkTargetValue\@GlowSquid\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** - * @vftbl 353 + * @vftbl 345 * @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 40cc067ea9..d07e02b443 100644 --- a/LiteLoader/include/llapi/mc/GlowStickItem.hpp +++ b/LiteLoader/include/llapi/mc/GlowStickItem.hpp @@ -36,11 +36,6 @@ class GlowStickItem : public ChemistryStickItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class GlowStickItem : public ChemistryStickItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -112,7 +112,17 @@ class GlowStickItem : public ChemistryStickItem { */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 122 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 124 * @symbol ?getLightEmission\@GlowStickItem\@\@UEBA?AUBrightness\@\@H\@Z */ virtual struct Brightness getLightEmission(int) const; diff --git a/LiteLoader/include/llapi/mc/LightGemBlock.hpp b/LiteLoader/include/llapi/mc/GlowstoneBlock.hpp similarity index 51% rename from LiteLoader/include/llapi/mc/LightGemBlock.hpp rename to LiteLoader/include/llapi/mc/GlowstoneBlock.hpp index 215e499e42..98bbb1739e 100644 --- a/LiteLoader/include/llapi/mc/LightGemBlock.hpp +++ b/LiteLoader/include/llapi/mc/GlowstoneBlock.hpp @@ -1,5 +1,5 @@ /** - * @file LightGemBlock.hpp + * @file GlowstoneBlock.hpp * */ #pragma once @@ -8,25 +8,20 @@ #include "BlockLegacy.hpp" #define BEFORE_EXTRA -// Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC class LightGemBlock. - * - */ -class LightGemBlock : public BlockLegacy { + +class GlowstoneBlock : public BlockLegacy { #define AFTER_EXTRA -// Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LIGHTGEMBLOCK +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_GLOWSTONEBLOCK public: - class LightGemBlock& operator=(class LightGemBlock const &) = delete; - LightGemBlock(class LightGemBlock const &) = delete; - LightGemBlock() = delete; + class GlowstoneBlock& operator=(class GlowstoneBlock const &) = delete; + GlowstoneBlock(class GlowstoneBlock const &) = delete; + GlowstoneBlock() = delete; #endif public: @@ -40,16 +35,21 @@ class LightGemBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +61,10 @@ class LightGemBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +96,10 @@ class LightGemBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,123 +126,118 @@ class LightGemBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 70 + * @symbol ?dispense\@GlowstoneBlock\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ - virtual void __unk_vfn_61(); + virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 71 - * @symbol ?dispense\@LightGemBlock\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + 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 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_169(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_173(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_177(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 - */ - virtual void __unk_vfn_187(); - /** - * @vftbl 189 - * @symbol ?getResourceItem\@LightGemBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@GlowstoneBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 - * @symbol ?getResourceCount\@LightGemBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@GlowstoneBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @symbol ??0LightGemBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0GlowstoneBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ - MCAPI LightGemBlock(std::string const &, int, class Material const &); + MCAPI GlowstoneBlock(std::string const &, int, class Material const &); }; diff --git a/LiteLoader/include/llapi/mc/GoalDefinition.hpp b/LiteLoader/include/llapi/mc/GoalDefinition.hpp index d8ff241572..55df9db62f 100644 --- a/LiteLoader/include/llapi/mc/GoalDefinition.hpp +++ b/LiteLoader/include/llapi/mc/GoalDefinition.hpp @@ -26,14 +26,14 @@ struct GoalDefinition { * @symbol ??0GoalDefinition\@\@QEAA\@XZ */ MCAPI GoalDefinition(); - /** - * @symbol ??0GoalDefinition\@\@QEAA\@AEBU0\@\@Z - */ - MCAPI GoalDefinition(struct GoalDefinition const &); /** * @symbol ??0GoalDefinition\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI GoalDefinition(struct GoalDefinition &&); + /** + * @symbol ??0GoalDefinition\@\@QEAA\@AEBU0\@\@Z + */ + MCAPI GoalDefinition(struct GoalDefinition const &); /** * @symbol ?_getPOITypeFromString\@GoalDefinition\@\@QEAA?AW4POIType\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/Goat.hpp b/LiteLoader/include/llapi/mc/Goat.hpp index 73dea268b1..1b4a0bd1ef 100644 --- a/LiteLoader/include/llapi/mc/Goat.hpp +++ b/LiteLoader/include/llapi/mc/Goat.hpp @@ -42,160 +42,155 @@ class Goat : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 133 + * @vftbl 131 * @symbol ?getAmbientSound\@Goat\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getAmbientSound() const; /** - * @vftbl 141 + * @vftbl 139 * @symbol ?handleEntityEvent\@Goat\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 258 + * @vftbl 250 * @symbol ?updateEntitySpecificMolangVariables\@Goat\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@Goat\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@Goat\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 279 + * @vftbl 271 * @symbol ?getHurtSound\@Goat\@\@UEAA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getHurtSound(); /** - * @vftbl 280 + * @vftbl 272 * @symbol ?getDeathSound\@Goat\@\@UEAA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getDeathSound(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0Goat\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/GoatHornItem.hpp b/LiteLoader/include/llapi/mc/GoatHornItem.hpp index 560d91352c..d8863adee6 100644 --- a/LiteLoader/include/llapi/mc/GoatHornItem.hpp +++ b/LiteLoader/include/llapi/mc/GoatHornItem.hpp @@ -36,11 +36,6 @@ class GoatHornItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class GoatHornItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -122,7 +122,17 @@ class GoatHornItem : public Item { */ virtual int getCooldownTime() const; /** - * @vftbl 124 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 126 * @symbol ?canBeCharged\@GoatHornItem\@\@UEBA_NXZ */ virtual bool canBeCharged() const; diff --git a/LiteLoader/include/llapi/mc/GrassBlock.hpp b/LiteLoader/include/llapi/mc/GrassBlock.hpp index 25f87bd4cf..fa3d72d78f 100644 --- a/LiteLoader/include/llapi/mc/GrassBlock.hpp +++ b/LiteLoader/include/llapi/mc/GrassBlock.hpp @@ -40,16 +40,21 @@ class GrassBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class GrassBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class GrassBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,157 +131,152 @@ class GrassBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 52 + * @vftbl 51 * @symbol ?canBeOriginalSurface\@GrassBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@GrassBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@GrassBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 95 + * @vftbl 94 * @symbol ?tryToTill\@GrassBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@AEAVItemStack\@\@\@Z */ virtual bool tryToTill(class BlockSource &, class BlockPos const &, class Actor &, class ItemStack &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 107 + * @vftbl 106 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 136 + * @vftbl 134 * @symbol ?getColor\@GrassBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 137 + * @vftbl 135 * @symbol ?getColor\@GrassBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 173 + * @vftbl 171 * @symbol ?randomTick\@GrassBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@GrassBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 186 + * @vftbl 185 * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @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 82156c68af..4b3cacfc44 100644 --- a/LiteLoader/include/llapi/mc/GravelBlock.hpp +++ b/LiteLoader/include/llapi/mc/GravelBlock.hpp @@ -5,7 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "HeavyBlock.hpp" +#include "FallingBlock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +16,7 @@ * @brief MC class GravelBlock. * */ -class GravelBlock : public HeavyBlock { +class GravelBlock : public FallingBlock { #define AFTER_EXTRA // Add Member There @@ -40,16 +40,21 @@ class GravelBlock : public HeavyBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class GravelBlock : public HeavyBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class GravelBlock : public HeavyBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,145 +131,140 @@ class GravelBlock : public HeavyBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 52 + * @vftbl 51 * @symbol ?canBeOriginalSurface\@GravelBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@GravelBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 86 * @symbol ?mayConsumeFertilizer\@GravelBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@GravelBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_169(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_173(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_177(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 - */ - virtual void __unk_vfn_187(); - /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@GravelBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 195 + * @vftbl 194 * @symbol ?getDustColor\@GravelBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 196 + * @vftbl 195 * @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 197 - * @symbol __unk_vfn_197 + * @vftbl 196 + * @symbol __unk_vfn_196 */ - virtual void __unk_vfn_197(); + virtual void __unk_vfn_196(); /** * @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 4c666c3e41..6a27d9071e 100644 --- a/LiteLoader/include/llapi/mc/GrindstoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/GrindstoneBlock.hpp @@ -45,16 +45,26 @@ class GrindstoneBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); + /** + * @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 + */ + virtual void __unk_vfn_28(); /** * @vftbl 29 * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +76,10 @@ class GrindstoneBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +111,10 @@ class GrindstoneBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,15 +141,15 @@ class GrindstoneBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -147,126 +157,121 @@ class GrindstoneBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@GrindstoneBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@GrindstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@GrindstoneBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@GrindstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@GrindstoneBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@GrindstoneBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@GrindstoneBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/GroundTravelTypeSystem.hpp b/LiteLoader/include/llapi/mc/GroundTravelTypeSystem.hpp index 52390fc4c3..faaf7211ef 100644 --- a/LiteLoader/include/llapi/mc/GroundTravelTypeSystem.hpp +++ b/LiteLoader/include/llapi/mc/GroundTravelTypeSystem.hpp @@ -25,16 +25,24 @@ class GroundTravelTypeSystem { public: /** - * @symbol ?create\@GroundTravelTypeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?calcMoveRelativeSpeed\@GroundTravelTypeSystem\@\@SAMAEBUIMobMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z */ - MCAPI static struct TickingSystemWithInfo create(); + MCAPI static float calcMoveRelativeSpeed(struct IMobMovementProxy const &, class IConstBlockSource const &); /** - * @symbol ?createSideBySide\@GroundTravelTypeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?create\@GroundTravelTypeSystem\@\@SA?AUTickingSystemWithInfo\@\@AEBVBaseGameVersion\@\@\@Z */ - MCAPI static struct TickingSystemWithInfo createSideBySide(); + MCAPI static struct TickingSystemWithInfo create(class BaseGameVersion const &); /** - * @symbol ?tick\@GroundTravelTypeSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEBUStateVectorComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUAttributesComponent\@\@$$CBUMovementSpeedComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@USoulSpeedEnchantFlag\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMobTravelComponent\@\@\@\@AEBVIConstBlockSource\@\@\@Z + * @symbol ?createSideBySide\@GroundTravelTypeSystem\@\@SA?AUTickingSystemWithInfo\@\@AEBVBaseGameVersion\@\@\@Z */ - MCAPI static void tick(class StrictEntityContext const &, struct AABBShapeComponent const &, struct StateVectorComponent const &, class ViewT, class ViewT>>, class ViewT const>, class EntityModifierT, class IConstBlockSource const &); + MCAPI static struct TickingSystemWithInfo createSideBySide(class BaseGameVersion const &); + +//private: + +private: + /** + * @symbol ?FRICTION_FIX_VERSION\@GroundTravelTypeSystem\@\@0VBaseGameVersion\@\@B + */ + MCAPI static class BaseGameVersion const FRICTION_FIX_VERSION; }; diff --git a/LiteLoader/include/llapi/mc/GroundTravelTypeSystemUtils.hpp b/LiteLoader/include/llapi/mc/GroundTravelTypeSystemUtils.hpp deleted file mode 100644 index b40f814cde..0000000000 --- a/LiteLoader/include/llapi/mc/GroundTravelTypeSystemUtils.hpp +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file GroundTravelTypeSystemUtils.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -namespace GroundTravelTypeSystemUtils { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA - /** - * @symbol ?calcGroundFriction\@GroundTravelTypeSystemUtils\@\@YAMAEBVBlock\@\@VStrictEntityContext\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@USoulSpeedEnchantFlag\@\@\@\@\@\@\@Z - */ - MCAPI float calcGroundFriction(class Block const &, class StrictEntityContext, class ViewT const> const &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/Guardian.hpp b/LiteLoader/include/llapi/mc/Guardian.hpp index 2edb7db686..d130263888 100644 --- a/LiteLoader/include/llapi/mc/Guardian.hpp +++ b/LiteLoader/include/llapi/mc/Guardian.hpp @@ -47,162 +47,157 @@ class Guardian : public Monster { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 114 + * @vftbl 112 * @symbol ?setTarget\@Guardian\@\@UEAAXPEAVActor\@\@\@Z */ virtual void setTarget(class Actor *); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@Guardian\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@Guardian\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@Guardian\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 274 + * @vftbl 266 * @symbol ?_onSizeUpdated\@Guardian\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 293 + * @vftbl 285 * @symbol ?checkSpawnRules\@Guardian\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 302 + * @vftbl 294 * @symbol ?getMaxHeadXRot\@Guardian\@\@UEAAMXZ */ virtual float getMaxHeadXRot(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** - * @vftbl 353 + * @vftbl 345 * @symbol ?isDarkEnoughToSpawn\@Guardian\@\@MEBA_NXZ */ virtual bool isDarkEnoughToSpawn() const; diff --git a/LiteLoader/include/llapi/mc/GuiDataPickItemPacket.hpp b/LiteLoader/include/llapi/mc/GuiDataPickItemPacket.hpp index 141207d165..120a6f0e4c 100644 --- a/LiteLoader/include/llapi/mc/GuiDataPickItemPacket.hpp +++ b/LiteLoader/include/llapi/mc/GuiDataPickItemPacket.hpp @@ -51,22 +51,22 @@ class GuiDataPickItemPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@GuiDataPickItemPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@GuiDataPickItemPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_GUIDATAPICKITEMPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~GuiDataPickItemPacket(); #endif - /** - * @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(); + /** + * @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 &); }; diff --git a/LiteLoader/include/llapi/mc/HangingActor.hpp b/LiteLoader/include/llapi/mc/HangingActor.hpp index 79b45c75b0..25301f4517 100644 --- a/LiteLoader/include/llapi/mc/HangingActor.hpp +++ b/LiteLoader/include/llapi/mc/HangingActor.hpp @@ -46,182 +46,177 @@ class HangingActor : public Actor { */ virtual void __unk_vfn_16(); /** - * @vftbl 28 + * @vftbl 27 * @symbol ?move\@HangingActor\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void move(class Vec3 const &); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@HangingActor\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** * @vftbl 85 - * @symbol __unk_vfn_85 - */ - virtual void __unk_vfn_85(); - /** - * @vftbl 87 * @symbol ?getBrightness\@HangingActor\@\@UEBAMMAEBVIConstBlockSource\@\@\@Z */ virtual float getBrightness(float, class IConstBlockSource const &) const; /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_86(); /** - * @vftbl 95 + * @vftbl 93 * @symbol ?isPickable\@HangingActor\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 + */ + virtual void __unk_vfn_94(); + /** + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 134 + * @vftbl 132 * @symbol ?isInvulnerableTo\@HangingActor\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 233 + * @vftbl 225 * @symbol ?setSize\@HangingActor\@\@UEAAXMM\@Z */ virtual void setSize(float, float); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@HangingActor\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@HangingActor\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@HangingActor\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 276 + * @vftbl 268 * @symbol ?setDir\@HangingActor\@\@UEAAXH\@Z */ virtual void setDir(int); /** - * @vftbl 277 - * @symbol ?getWidth\@Painting\@\@UEBAHXZ + * @vftbl 269 + * @symbol ?getWidth\@LeashFenceKnotActor\@\@UEBAHXZ */ virtual int getWidth() const = 0; /** - * @vftbl 278 - * @symbol ?getHeight\@Painting\@\@UEBAHXZ + * @vftbl 270 + * @symbol ?getHeight\@LeashFenceKnotActor\@\@UEBAHXZ */ virtual int getHeight() const = 0; /** - * @vftbl 279 - * @symbol ?dropItem\@Painting\@\@UEAAXXZ + * @vftbl 271 + * @symbol ?dropItem\@LeashFenceKnotActor\@\@UEAAXXZ */ virtual void dropItem() = 0; /** - * @vftbl 280 + * @vftbl 272 * @symbol ?placeHangingEntity\@HangingActor\@\@UEAA_NAEAVBlockSource\@\@H\@Z */ virtual bool placeHangingEntity(class BlockSource &, int); /** - * @vftbl 281 + * @vftbl 273 * @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 0da620c551..8a6ef8d39f 100644 --- a/LiteLoader/include/llapi/mc/HangingActorItem.hpp +++ b/LiteLoader/include/llapi/mc/HangingActorItem.hpp @@ -36,11 +36,6 @@ class HangingActorItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class HangingActorItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -102,7 +102,17 @@ class HangingActorItem : public Item { */ virtual void __unk_vfn_80(); /** - * @vftbl 132 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 134 * @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/HangingRoots.hpp b/LiteLoader/include/llapi/mc/HangingRootsBlock.hpp similarity index 52% rename from LiteLoader/include/llapi/mc/HangingRoots.hpp rename to LiteLoader/include/llapi/mc/HangingRootsBlock.hpp index f82fe83870..a8fbde1160 100644 --- a/LiteLoader/include/llapi/mc/HangingRoots.hpp +++ b/LiteLoader/include/llapi/mc/HangingRootsBlock.hpp @@ -1,5 +1,5 @@ /** - * @file HangingRoots.hpp + * @file HangingRootsBlock.hpp * */ #pragma once @@ -8,25 +8,20 @@ #include "BlockLegacy.hpp" #define BEFORE_EXTRA -// Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC class HangingRoots. - * - */ -class HangingRoots : public BlockLegacy { + +class HangingRootsBlock : public BlockLegacy { #define AFTER_EXTRA -// Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_HANGINGROOTS +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_HANGINGROOTSBLOCK public: - class HangingRoots& operator=(class HangingRoots const &) = delete; - HangingRoots(class HangingRoots const &) = delete; - HangingRoots() = delete; + class HangingRootsBlock& operator=(class HangingRootsBlock const &) = delete; + HangingRootsBlock(class HangingRootsBlock const &) = delete; + HangingRootsBlock() = delete; #endif public: @@ -37,12 +32,12 @@ class HangingRoots : public BlockLegacy { virtual void __unk_vfn_0(); /** * @vftbl 8 - * @symbol ?randomlyModifyPosition\@HangingRoots\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z + * @symbol ?randomlyModifyPosition\@HangingRootsBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** * @vftbl 10 - * @symbol ?getAABB\@HangingRoots\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @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; /** @@ -50,16 +45,21 @@ class HangingRoots : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -71,10 +71,10 @@ class HangingRoots : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +106,10 @@ class HangingRoots : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,15 +136,15 @@ class HangingRoots : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -152,127 +152,122 @@ class HangingRoots : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 - * @symbol ?canContainLiquid\@HangingRoots\@\@UEBA_NXZ + * @symbol ?canContainLiquid\@HangingRootsBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 92 - * @symbol ?mayPlace\@HangingRoots\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 91 + * @symbol ?mayPlace\@HangingRootsBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@HangingRoots\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 98 + * @symbol ?neighborChanged\@HangingRootsBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 - * @symbol ?tick\@HangingRoots\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 170 + * @symbol ?tick\@HangingRootsBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 - * @symbol ?canSurvive\@HangingRoots\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol ?canSurvive\@HangingRootsBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 - * @symbol ?playerDestroy\@HangingRoots\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 187 + * @symbol ?playerDestroy\@HangingRootsBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 - * @symbol ?getResourceItem\@HangingRoots\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@HangingRootsBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @symbol ??0HangingRoots\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0HangingRootsBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ - MCAPI HangingRoots(std::string const &, int); + MCAPI HangingRootsBlock(std::string const &, int); }; diff --git a/LiteLoader/include/llapi/mc/HangingSignBlock.hpp b/LiteLoader/include/llapi/mc/HangingSignBlock.hpp index e44c1521d9..7f2ec9eff4 100644 --- a/LiteLoader/include/llapi/mc/HangingSignBlock.hpp +++ b/LiteLoader/include/llapi/mc/HangingSignBlock.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "SignBlockActor.hpp" #include "SignBlock.hpp" #define BEFORE_EXTRA @@ -54,16 +53,21 @@ class HangingSignBlock : public SignBlock { * @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 + */ + virtual void __unk_vfn_28(); /** * @vftbl 29 * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -75,10 +79,10 @@ class HangingSignBlock : public SignBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -110,10 +114,10 @@ class HangingSignBlock : public SignBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -140,144 +144,139 @@ class HangingSignBlock : public SignBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 69 + * @vftbl 68 * @symbol ?checkIsPathable\@HangingSignBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 91 + * @vftbl 90 * @symbol ?mayPlace\@HangingSignBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@HangingSignBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@HangingSignBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 196 + * @vftbl 195 * @symbol ?getYRotationInDegrees\@HangingSignBlock\@\@UEBAMAEBVBlock\@\@\@Z */ virtual float getYRotationInDegrees(class Block const &) const; /** - * @vftbl 198 + * @vftbl 197 * @symbol ?_getItemInstance\@HangingSignBlock\@\@MEBA?AVItemInstance\@\@XZ */ virtual class ItemInstance _getItemInstance() const; /** - * @vftbl 199 + * @vftbl 198 * @symbol ?_getShape\@HangingSignBlock\@\@MEBAXHAEAVAABB\@\@\@Z */ virtual void _getShape(int, class AABB &) const; /** - * @symbol ??0HangingSignBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_NW4SignType\@SignBlockActor\@\@\@Z + * @symbol ??0HangingSignBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_NW4SignType\@SignBlock\@\@\@Z */ - MCAPI HangingSignBlock(std::string const &, int, bool, enum class SignBlockActor::SignType); + MCAPI HangingSignBlock(std::string const &, int, bool, enum class SignBlock::SignType); /** * @symbol ?isDoubleChainHangingSign\@HangingSignBlock\@\@SA_NAEBVBlock\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/HangingSignBlockActor.hpp b/LiteLoader/include/llapi/mc/HangingSignBlockActor.hpp index 919e138d64..c01c54c8fb 100644 --- a/LiteLoader/include/llapi/mc/HangingSignBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/HangingSignBlockActor.hpp @@ -74,10 +74,10 @@ class HangingSignBlockActor : public SignBlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); /** * @symbol ??0HangingSignBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/HangingSignItem.hpp b/LiteLoader/include/llapi/mc/HangingSignItem.hpp index d056f0002c..d8828f8126 100644 --- a/LiteLoader/include/llapi/mc/HangingSignItem.hpp +++ b/LiteLoader/include/llapi/mc/HangingSignItem.hpp @@ -6,7 +6,7 @@ #define AUTO_GENERATED #include "llapi/Global.h" #include "Json.hpp" -#include "SignBlockActor.hpp" +#include "SignBlock.hpp" #include "SignItem.hpp" #define BEFORE_EXTRA @@ -35,11 +35,6 @@ class HangingSignItem : public SignItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -55,6 +50,11 @@ class HangingSignItem : public SignItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -101,24 +101,29 @@ class HangingSignItem : public SignItem { */ virtual void __unk_vfn_80(); /** - * @vftbl 131 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 133 * @symbol ?_calculatePlacePos\@HangingSignItem\@\@EEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 133 + * @vftbl 135 * @symbol ?getBlockToPlace\@HangingSignItem\@\@MEBAPEBVBlock\@\@EAEBVActor\@\@VBlockPos\@\@\@Z */ virtual class Block const * getBlockToPlace(unsigned char, class Actor const &, class BlockPos) const; /** - * @vftbl 134 - * @symbol ?_initializeTags\@HangingSignItem\@\@EEAAXXZ - */ - virtual void _initializeTags(); - /** - * @symbol ??0HangingSignItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4SignType\@SignBlockActor\@\@\@Z + * @symbol ??0HangingSignItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4SignType\@SignBlock\@\@\@Z */ - MCAPI HangingSignItem(std::string const &, int, enum class SignBlockActor::SignType); + MCAPI HangingSignItem(std::string const &, int, enum class SignBlock::SignType); //private: /** diff --git a/LiteLoader/include/llapi/mc/HatchetItem.hpp b/LiteLoader/include/llapi/mc/HatchetItem.hpp index 4d28557b61..af17bd9e71 100644 --- a/LiteLoader/include/llapi/mc/HatchetItem.hpp +++ b/LiteLoader/include/llapi/mc/HatchetItem.hpp @@ -37,11 +37,6 @@ class HatchetItem : public DiggerItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 10 * @symbol ?executeEvent\@HatchetItem\@\@UEBAXAEAVItemStackBase\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVRenderParams\@\@\@Z @@ -62,6 +57,11 @@ class HatchetItem : public DiggerItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -117,6 +117,16 @@ class HatchetItem : public DiggerItem { * @symbol ?getDestroySpeed\@HatchetItem\@\@UEBAMAEBVItemStackBase\@\@AEBVBlock\@\@\@Z */ virtual float getDestroySpeed(class ItemStackBase const &, class Block const &) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); /** * @symbol ??0HatchetItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVTier\@Item\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/HayBlockBlock.hpp b/LiteLoader/include/llapi/mc/HayBlock.hpp similarity index 51% rename from LiteLoader/include/llapi/mc/HayBlockBlock.hpp rename to LiteLoader/include/llapi/mc/HayBlock.hpp index 553101cf4d..25921e2372 100644 --- a/LiteLoader/include/llapi/mc/HayBlockBlock.hpp +++ b/LiteLoader/include/llapi/mc/HayBlock.hpp @@ -1,5 +1,5 @@ /** - * @file HayBlockBlock.hpp + * @file HayBlock.hpp * */ #pragma once @@ -8,25 +8,20 @@ #include "RotatedPillarBlock.hpp" #define BEFORE_EXTRA -// Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC class HayBlockBlock. - * - */ -class HayBlockBlock : public RotatedPillarBlock { + +class HayBlock : public RotatedPillarBlock { #define AFTER_EXTRA -// Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_HAYBLOCKBLOCK +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_HAYBLOCK public: - class HayBlockBlock& operator=(class HayBlockBlock const &) = delete; - HayBlockBlock(class HayBlockBlock const &) = delete; - HayBlockBlock() = delete; + class HayBlock& operator=(class HayBlock const &) = delete; + HayBlock(class HayBlock const &) = delete; + HayBlock() = delete; #endif public: @@ -40,16 +35,21 @@ class HayBlockBlock : public RotatedPillarBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +61,10 @@ class HayBlockBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +96,10 @@ class HayBlockBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,123 +126,118 @@ class HayBlockBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 102 + * @symbol ?asItemInstance\@HayBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ - virtual void __unk_vfn_82(); + virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@HayBlockBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 145 + * @symbol ?getVariant\@HayBlock\@\@UEBAHAEBVBlock\@\@\@Z */ - virtual void __unk_vfn_132(); + virtual int getVariant(class Block const &) const; /** - * @vftbl 147 - * @symbol ?getVariant\@HayBlockBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual int getVariant(class Block const &) const; + virtual void __unk_vfn_155(); + /** + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 170 - * @symbol ?onFallOn\@HayBlockBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z + * @symbol ?onFallOn\@HayBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @symbol ??0HayBlockBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0HayBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ - MCAPI HayBlockBlock(std::string const &, int); + MCAPI HayBlock(std::string const &, int); }; diff --git a/LiteLoader/include/llapi/mc/HeavyBlock.hpp b/LiteLoader/include/llapi/mc/HeavyBlock.hpp deleted file mode 100644 index 276f2ce2ac..0000000000 --- a/LiteLoader/include/llapi/mc/HeavyBlock.hpp +++ /dev/null @@ -1,309 +0,0 @@ -/** - * @file HeavyBlock.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "BlockLegacy.hpp" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class HeavyBlock. - * - */ -class HeavyBlock : public BlockLegacy { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_HEAVYBLOCK -public: - class HeavyBlock& operator=(class HeavyBlock const &) = delete; - HeavyBlock(class HeavyBlock const &) = delete; - HeavyBlock() = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); - /** - * @vftbl 30 - * @symbol __unk_vfn_30 - */ - virtual void __unk_vfn_30(); - /** - * @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 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 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 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 60 - * @symbol __unk_vfn_60 - */ - virtual void __unk_vfn_60(); - /** - * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 75 - * @symbol __unk_vfn_75 - */ - virtual void __unk_vfn_75(); - /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 99 - * @symbol ?neighborChanged\@HeavyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z - */ - virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; - /** - * @vftbl 105 - * @symbol __unk_vfn_105 - */ - virtual void __unk_vfn_105(); - /** - * @vftbl 123 - * @symbol __unk_vfn_123 - */ - virtual void __unk_vfn_123(); - /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 - */ - virtual void __unk_vfn_126(); - /** - * @vftbl 129 - * @symbol __unk_vfn_129 - */ - virtual void __unk_vfn_129(); - /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 152 - * @symbol ?animateTick\@HeavyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z - */ - virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; - /** - * @vftbl 157 - * @symbol __unk_vfn_157 - */ - virtual void __unk_vfn_157(); - /** - * @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 ?onPlace\@HeavyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - virtual void onPlace(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 171 - * @symbol __unk_vfn_171 - */ - virtual void __unk_vfn_171(); - /** - * @vftbl 172 - * @symbol ?tick\@HeavyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z - */ - virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; - /** - * @vftbl 175 - * @symbol __unk_vfn_175 - */ - virtual void __unk_vfn_175(); - /** - * @vftbl 179 - * @symbol __unk_vfn_179 - */ - virtual void __unk_vfn_179(); - /** - * @vftbl 187 - * @symbol __unk_vfn_187 - */ - virtual void __unk_vfn_187(); - /** - * @vftbl 195 - * @symbol ?getDustColor\@ConcretePowderBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z - */ - virtual class mce::Color getDustColor(class Block const &) const = 0; - /** - * @vftbl 196 - * @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 = 0; - /** - * @vftbl 197 - * @symbol __unk_vfn_197 - */ - virtual void __unk_vfn_197(); - /** - * @vftbl 198 - * @symbol ?onLand\@HeavyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - virtual void onLand(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 199 - * @symbol ?isFreeToFall\@HeavyBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - virtual bool isFreeToFall(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 200 - * @symbol ?startFalling\@HeavyBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@_N\@Z - */ - virtual void startFalling(class BlockSource &, class BlockPos const &, class Block const &, bool) const; -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_HEAVYBLOCK - /** - * @symbol ?falling\@HeavyBlock\@\@UEBA_NXZ - */ - MCVAPI bool falling() const; - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~HeavyBlock(); -#endif - /** - * @symbol ??0HeavyBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z - */ - MCAPI HeavyBlock(std::string const &, int, class Material const &); - /** - * @symbol ?triggerFallCheck\@HeavyBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI void triggerFallCheck(class BlockSource &, class BlockPos const &) const; - -//protected: - /** - * @symbol ?_tickBlocksAround2D\@HeavyBlock\@\@IEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z - */ - MCAPI void _tickBlocksAround2D(class BlockSource &, class BlockPos const &, class Block const &) const; - /** - * @symbol ?checkSlide\@HeavyBlock\@\@IEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI void checkSlide(class BlockSource &, class BlockPos const &) const; - -protected: - -}; diff --git a/LiteLoader/include/llapi/mc/HitResult.hpp b/LiteLoader/include/llapi/mc/HitResult.hpp index a5e4bfd422..c136f08f59 100644 --- a/LiteLoader/include/llapi/mc/HitResult.hpp +++ b/LiteLoader/include/llapi/mc/HitResult.hpp @@ -67,10 +67,6 @@ 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 */ @@ -84,13 +80,17 @@ class HitResult { */ MCAPI HitResult(class Vec3 const &, class Vec3 const &, class Vec3 const &); /** - * @symbol ??0HitResult\@\@QEAA\@AEBVVec3\@\@0AEBVBlockPos\@\@E0\@Z + * @symbol ??0HitResult\@\@QEAA\@AEBVVec3\@\@0AEAVActor\@\@0\@Z */ - MCAPI HitResult(class Vec3 const &, class Vec3 const &, class BlockPos const &, unsigned char, class Vec3 const &); + MCAPI HitResult(class Vec3 const &, class Vec3 const &, class Actor &, 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/HoeItem.hpp b/LiteLoader/include/llapi/mc/HoeItem.hpp index c75e621848..5fc455a81d 100644 --- a/LiteLoader/include/llapi/mc/HoeItem.hpp +++ b/LiteLoader/include/llapi/mc/HoeItem.hpp @@ -37,11 +37,6 @@ class HoeItem : public DiggerItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 10 * @symbol ?executeEvent\@HoeItem\@\@UEBAXAEAVItemStackBase\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVRenderParams\@\@\@Z @@ -62,6 +57,11 @@ class HoeItem : public DiggerItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -112,6 +112,16 @@ class HoeItem : public DiggerItem { * @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 ??0HoeItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVTier\@Item\@\@AEBVExperiments\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/HoneyBlock.hpp b/LiteLoader/include/llapi/mc/HoneyBlock.hpp index 7fd5a7548d..2ace44d1ee 100644 --- a/LiteLoader/include/llapi/mc/HoneyBlock.hpp +++ b/LiteLoader/include/llapi/mc/HoneyBlock.hpp @@ -45,16 +45,21 @@ class HoneyBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class HoneyBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class HoneyBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,130 +136,125 @@ class HoneyBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 - */ - virtual void __unk_vfn_105(); - /** - * @vftbl 113 + * @vftbl 112 * @symbol ?entityInside\@HoneyBlock\@\@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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@HoneyBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 165 + * @vftbl 163 * @symbol ?onStandOn\@HoneyBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ virtual void onStandOn(class EntityContext &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?onFallOn\@HoneyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 183 + * @vftbl 181 * @symbol ?getExtraRenderLayers\@HoneyBlock\@\@UEBAHXZ */ virtual int getExtraRenderLayers() const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 e70695a762..371394fccd 100644 --- a/LiteLoader/include/llapi/mc/HoneycombBlock.hpp +++ b/LiteLoader/include/llapi/mc/HoneycombBlock.hpp @@ -40,16 +40,21 @@ class HoneycombBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class HoneycombBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class HoneycombBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,105 +131,100 @@ class HoneycombBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 50ea641e96..c1cb0e3128 100644 --- a/LiteLoader/include/llapi/mc/HopperBlock.hpp +++ b/LiteLoader/include/llapi/mc/HopperBlock.hpp @@ -55,16 +55,21 @@ class HopperBlock : public ActorBlock { * @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 + */ + virtual void __unk_vfn_28(); /** * @vftbl 29 * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -76,10 +81,10 @@ class HopperBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -111,10 +116,10 @@ class HopperBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -141,162 +146,157 @@ class HopperBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 73 + * @vftbl 72 * @symbol ?onRedstoneUpdate\@HopperBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@HopperBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 80 + * @vftbl 79 * @symbol ?getRedstoneProperty\@HopperBlock\@\@UEBA?AW4BlockProperty\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockProperty getRedstoneProperty(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 96 + * @vftbl 95 * @symbol ?breaksFallingBlocks\@HopperBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@HopperBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 - */ - virtual void __unk_vfn_126(); - /** - * @vftbl 127 + * @vftbl 125 * @symbol ?getComparatorSignal\@HopperBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@HopperBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@HopperBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 176 + * @vftbl 174 * @symbol ?clip\@HopperBlock\@\@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 178 + * @vftbl 176 * @symbol ?use\@HopperBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @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 6d02f144d3..51455121f6 100644 --- a/LiteLoader/include/llapi/mc/Horse.hpp +++ b/LiteLoader/include/llapi/mc/Horse.hpp @@ -42,267 +42,262 @@ class Horse : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 36 + * @vftbl 35 * @symbol ?getInterpolatedRidingOffset\@Horse\@\@UEBA?AVVec3\@\@MH\@Z */ virtual class Vec3 getInterpolatedRidingOffset(float, int) const; /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 52 + * @vftbl 51 * @symbol ?positionPassenger\@Horse\@\@UEAAXAEAVActor\@\@M\@Z */ virtual void positionPassenger(class Actor &, float); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 80 + * @vftbl 78 * @symbol ?getShadowRadius\@Horse\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_80(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_86(); /** - * @vftbl 92 + * @vftbl 90 * @symbol ?isImmobile\@Horse\@\@MEBA_NXZ */ virtual bool isImmobile() const; /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 + */ + virtual void __unk_vfn_94(); + /** + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 122 + * @vftbl 120 * @symbol ?onFailedTame\@Horse\@\@UEAAXXZ */ virtual void onFailedTame(); /** - * @vftbl 126 + * @vftbl 124 * @symbol ?setStanding\@Horse\@\@UEAAX_N\@Z */ virtual void setStanding(bool); /** - * @vftbl 140 + * @vftbl 138 * @symbol ?feed\@Horse\@\@UEAAXH\@Z */ virtual void feed(int); /** - * @vftbl 141 + * @vftbl 139 * @symbol ?handleEntityEvent\@Horse\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 171 + * @vftbl 169 * @symbol ?canFreeze\@Horse\@\@UEBA_NXZ */ virtual bool canFreeze() const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?getControllingPlayer\@Horse\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getControllingPlayer() const; /** - * @vftbl 182 + * @vftbl 180 * @symbol ?causeFallDamage\@Horse\@\@MEAAXMMVActorDamageSource\@\@\@Z */ virtual void causeFallDamage(float, float, class ActorDamageSource); /** - * @vftbl 183 + * @vftbl 181 * @symbol ?handleFallDistanceOnServer\@Horse\@\@MEAAXMM_N\@Z */ virtual void handleFallDistanceOnServer(float, float, bool); /** - * @vftbl 187 + * @vftbl 185 * @symbol ?onSynchedDataUpdate\@Horse\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 214 + * @vftbl 212 * @symbol ?openContainerComponent\@Horse\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void openContainerComponent(class Player &); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 245 + * @vftbl 237 * @symbol ?die\@Horse\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 258 + * @vftbl 250 * @symbol ?updateEntitySpecificMolangVariables\@Horse\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@Horse\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 266 + * @vftbl 258 * @symbol ?_playStepSound\@Horse\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 286 + * @vftbl 278 * @symbol ?travel\@Horse\@\@UEAAXMMM_N\@Z */ virtual void travel(float, float, float, bool); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 310 + * @vftbl 302 * @symbol ?getArmorValue\@Horse\@\@UEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** - * @vftbl 353 + * @vftbl 345 * @symbol ?setType\@Horse\@\@UEAAXH\@Z */ virtual void setType(int); /** - * @vftbl 354 + * @vftbl 346 * @symbol ?getType\@Horse\@\@UEBAHXZ */ virtual int getType() const; /** - * @vftbl 355 + * @vftbl 347 * @symbol ?setHorseEating\@Horse\@\@UEAAX_N\@Z */ virtual void setHorseEating(bool); /** - * @vftbl 356 + * @vftbl 348 * @symbol ?getStandAnim\@Horse\@\@UEBAMM\@Z */ virtual float getStandAnim(float) const; /** - * @vftbl 357 + * @vftbl 349 * @symbol ?isAdult\@Horse\@\@UEBA_NXZ */ virtual bool isAdult() const; /** - * @vftbl 358 + * @vftbl 350 * @symbol ?isHorseEating\@Horse\@\@UEBA_NXZ */ virtual bool isHorseEating() const; /** - * @vftbl 359 + * @vftbl 351 * @symbol ?isMouthOpen\@Horse\@\@UEBA_NXZ */ virtual bool isMouthOpen() const; /** - * @vftbl 360 + * @vftbl 352 * @symbol ?makeMad\@Horse\@\@UEAAXXZ */ virtual void makeMad(); /** - * @vftbl 361 + * @vftbl 353 * @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 e2e3c0c4f6..8d2e8ef818 100644 --- a/LiteLoader/include/llapi/mc/HorseArmorItem.hpp +++ b/LiteLoader/include/llapi/mc/HorseArmorItem.hpp @@ -38,11 +38,6 @@ enum class Tier; * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -63,6 +58,11 @@ enum class Tier; * @symbol ?isDyeable\@HorseArmorItem\@\@UEBA_NXZ */ virtual bool isDyeable() const; + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -143,6 +143,16 @@ enum class Tier; * @symbol ?dispense\@HorseArmorItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); /** * @symbol ??0HorseArmorItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HHW4Tier\@0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/HorsePostTravelSystem.hpp b/LiteLoader/include/llapi/mc/HorsePostTravelSystem.hpp index 49fef207b9..5b9588cdd4 100644 --- a/LiteLoader/include/llapi/mc/HorsePostTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/HorsePostTravelSystem.hpp @@ -28,6 +28,10 @@ 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/HorsePreTravelSystem.hpp b/LiteLoader/include/llapi/mc/HorsePreTravelSystem.hpp index bf8bca2466..0d594edad4 100644 --- a/LiteLoader/include/llapi/mc/HorsePreTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/HorsePreTravelSystem.hpp @@ -28,9 +28,5 @@ class HorsePreTravelSystem { * @symbol ?createHorsePreTravelSystem\@HorsePreTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createHorsePreTravelSystem(); - /** - * @symbol ?tickHorsePreTravelSystem\@HorsePreTravelSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@V?$Optional\@UVehicleComponent\@\@\@\@$$CBUSynchedActorDataComponent\@\@UFlySpeedComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@$$CBUVehicleComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@UMobFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UWasOnGroundPreTravelFlag\@\@\@\@\@\@\@Z - */ - MCAPI static void tickHorsePreTravelSystem(class ViewT, class FlagComponent, class FlagComponent>, class Optional, struct SynchedActorDataComponent const, struct FlySpeedComponent>, class ViewT>, struct VehicleComponent const, struct SynchedActorDataComponent const>, class ViewT const>, class ViewT const>, class ViewT const>, class EntityModifierT>); }; diff --git a/LiteLoader/include/llapi/mc/HugeMushroomBlock.hpp b/LiteLoader/include/llapi/mc/HugeMushroomBlock.hpp index 212ac85a70..30cdf7ac4e 100644 --- a/LiteLoader/include/llapi/mc/HugeMushroomBlock.hpp +++ b/LiteLoader/include/llapi/mc/HugeMushroomBlock.hpp @@ -40,16 +40,21 @@ class HugeMushroomBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class HugeMushroomBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class HugeMushroomBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,137 +131,132 @@ class HugeMushroomBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@HugeMushroomBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@HugeMushroomBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 186 + * @vftbl 185 * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@HugeMushroomBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@HugeMushroomBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@HugeMushroomBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/HugeMushroomFeature.hpp b/LiteLoader/include/llapi/mc/HugeMushroomFeature.hpp index 423956009a..d769cdf5f1 100644 --- a/LiteLoader/include/llapi/mc/HugeMushroomFeature.hpp +++ b/LiteLoader/include/llapi/mc/HugeMushroomFeature.hpp @@ -45,14 +45,14 @@ class HugeMushroomFeature : public Feature { */ MCVAPI ~HugeMushroomFeature(); #endif - /** - * @symbol ??0HugeMushroomFeature\@\@QEAA\@H\@Z - */ - MCAPI HugeMushroomFeature(int); /** * @symbol ??0HugeMushroomFeature\@\@QEAA\@XZ */ MCAPI HugeMushroomFeature(); + /** + * @symbol ??0HugeMushroomFeature\@\@QEAA\@H\@Z + */ + MCAPI HugeMushroomFeature(int); /** * @symbol ?placeFixed\@HugeMushroomFeature\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z */ diff --git a/LiteLoader/include/llapi/mc/HumanoidMonster.hpp b/LiteLoader/include/llapi/mc/HumanoidMonster.hpp index 2536f80df9..5d23f1f408 100644 --- a/LiteLoader/include/llapi/mc/HumanoidMonster.hpp +++ b/LiteLoader/include/llapi/mc/HumanoidMonster.hpp @@ -37,150 +37,145 @@ class HumanoidMonster : public Monster { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@HumanoidMonster\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 - */ - virtual void __unk_vfn_260(); - /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@HumanoidMonster\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@HumanoidMonster\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 296 + * @vftbl 288 * @symbol ?getItemUseDuration\@HumanoidMonster\@\@UEBAHXZ */ virtual int getItemUseDuration() const; /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 304 + * @vftbl 296 * @symbol ?doHurtTarget\@HumanoidMonster\@\@UEAA_NPEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z */ virtual bool doHurtTarget(class Actor *, enum class ActorDamageCause const &); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); #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 3e856833b9..a1ca74058f 100644 --- a/LiteLoader/include/llapi/mc/HurtArmorPacket.hpp +++ b/LiteLoader/include/llapi/mc/HurtArmorPacket.hpp @@ -51,9 +51,9 @@ class HurtArmorPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@HurtArmorPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@HurtArmorPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 0edf63acd3..05c32e4308 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\@\@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 ?chooseLanguage\@I18n\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI static void chooseLanguage(std::string 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/IceBlock.hpp b/LiteLoader/include/llapi/mc/IceBlock.hpp index 1448c8f3c8..d656e51c9f 100644 --- a/LiteLoader/include/llapi/mc/IceBlock.hpp +++ b/LiteLoader/include/llapi/mc/IceBlock.hpp @@ -40,16 +40,21 @@ class IceBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class IceBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class IceBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,127 +131,122 @@ class IceBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 96 + * @vftbl 95 * @symbol ?breaksFallingBlocks\@IceBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 101 + * @vftbl 100 * @symbol ?playerWillDestroy\@IceBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 162 + * @vftbl 160 * @symbol ?_addHardCodedBlockComponents\@IceBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 173 + * @vftbl 171 * @symbol ?randomTick\@IceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 190 + * @vftbl 189 * @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 cb11265df5..567c52a10e 100644 --- a/LiteLoader/include/llapi/mc/IceBombItem.hpp +++ b/LiteLoader/include/llapi/mc/IceBombItem.hpp @@ -36,11 +36,6 @@ class IceBombItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class IceBombItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 23 * @symbol ?isThrowable\@IceBombItem\@\@UEBA_NXZ @@ -126,6 +126,16 @@ class IceBombItem : public Item { * @symbol ?getCooldownTime\@IceBombItem\@\@UEBAHXZ */ virtual int getCooldownTime() const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); /** * @symbol ??0IceBombItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/IconItemComponent.hpp b/LiteLoader/include/llapi/mc/IconItemComponent.hpp index 3ac49d0d68..4cbe8e9c30 100644 --- a/LiteLoader/include/llapi/mc/IconItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/IconItemComponent.hpp @@ -51,16 +51,11 @@ class IconItemComponent { virtual void __unk_vfn_3(); /** * @vftbl 4 - * @symbol __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 * @symbol ?buildNetworkTag\@?$NetworkedItemComponent\@VIconItemComponent\@\@\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 5 * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VIconItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); @@ -72,6 +67,10 @@ class IconItemComponent { * @symbol ?setOwnerIcon\@IconItemComponent\@\@QEAAXXZ */ MCAPI void setOwnerIcon(); + /** + * @symbol ?setTexturePath\@IconItemComponent\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI void setTexturePath(std::string const &); /** * @symbol ?bindType\@IconItemComponent\@\@SAXXZ */ diff --git a/LiteLoader/include/llapi/mc/IllagerBeast.hpp b/LiteLoader/include/llapi/mc/IllagerBeast.hpp index 5ab7e91d79..b34be00f5d 100644 --- a/LiteLoader/include/llapi/mc/IllagerBeast.hpp +++ b/LiteLoader/include/llapi/mc/IllagerBeast.hpp @@ -37,130 +37,125 @@ class IllagerBeast : public Monster { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 42 + * @vftbl 41 * @symbol ?blockedByShield\@IllagerBeast\@\@UEAAXAEBVActorDamageSource\@\@AEAVActor\@\@\@Z */ virtual void blockedByShield(class ActorDamageSource const &, class Actor &); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); - /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0IllagerBeast\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ImmobileSystem.hpp b/LiteLoader/include/llapi/mc/ImmobileSystem.hpp index 1dd7392a9c..0a90b300b1 100644 --- a/LiteLoader/include/llapi/mc/ImmobileSystem.hpp +++ b/LiteLoader/include/llapi/mc/ImmobileSystem.hpp @@ -29,9 +29,9 @@ class ImmobileSystem { */ MCAPI static struct TickingSystemWithInfo createSystem(); /** - * @symbol ?tickImmobileSystem\@ImmobileSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UMobIsImmobileFlag\@\@\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@\@\@ULocalMoveVelocityComponent\@\@UMobRotationComponent\@\@UStateVectorComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@Z + * @symbol ?tickImmobileSystem\@ImmobileSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UMobIsImmobileFlag\@\@\@\@\@\@ULocalMoveVelocityComponent\@\@UMobRotationComponent\@\@UStateVectorComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@Z */ - MCAPI static void tickImmobileSystem(class ViewT, class FlagComponent, class FlagComponent>, struct LocalMoveVelocityComponent, struct MobRotationComponent, struct StateVectorComponent>, class EntityModifierT>); + MCAPI static void tickImmobileSystem(class ViewT, class FlagComponent>, struct LocalMoveVelocityComponent, struct MobRotationComponent, struct StateVectorComponent>, class EntityModifierT>); //private: /** diff --git a/LiteLoader/include/llapi/mc/IndexSet.hpp b/LiteLoader/include/llapi/mc/IndexSet.hpp index 12589f7ce7..60ea14d0c1 100644 --- a/LiteLoader/include/llapi/mc/IndexSet.hpp +++ b/LiteLoader/include/llapi/mc/IndexSet.hpp @@ -28,17 +28,17 @@ class IndexSet { public: /** - * @symbol ??0IndexSet\@\@QEAA\@XZ + * @symbol ??0IndexSet\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI IndexSet(); + MCAPI IndexSet(class IndexSet &&); /** * @symbol ??0IndexSet\@\@QEAA\@AEBV0\@\@Z */ MCAPI IndexSet(class IndexSet const &); /** - * @symbol ??0IndexSet\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0IndexSet\@\@QEAA\@XZ */ - MCAPI IndexSet(class IndexSet &&); + MCAPI IndexSet(); /** * @symbol ?contains\@IndexSet\@\@QEBA_N_K\@Z */ diff --git a/LiteLoader/include/llapi/mc/InfestedBlock.hpp b/LiteLoader/include/llapi/mc/InfestedBlock.hpp index 2a225fe48b..1b257cdf46 100644 --- a/LiteLoader/include/llapi/mc/InfestedBlock.hpp +++ b/LiteLoader/include/llapi/mc/InfestedBlock.hpp @@ -40,16 +40,21 @@ class InfestedBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class InfestedBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class InfestedBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,124 +131,144 @@ class InfestedBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 101 + * @symbol ?spawnResources\@InfestedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ - virtual void __unk_vfn_82(); + virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** * @vftbl 102 - * @symbol ?spawnResources\@InfestedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @symbol ?asItemInstance\@InfestedBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ - virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; + virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 + * @symbol ?buildDescriptionId\@InfestedBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ - virtual void __unk_vfn_132(); + virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 133 + * @symbol ?isAuxValueRelevantForPicking\@InfestedBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_157(); + virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 145 + * @symbol ?getVariant\@InfestedBlock\@\@UEBAHAEBVBlock\@\@\@Z */ - virtual void __unk_vfn_166(); + virtual int getVariant(class Block const &) const; /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_155(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 159 + * @symbol ?tryGetUninfested\@InfestedBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ - virtual void __unk_vfn_168(); + virtual class Block const * tryGetUninfested(class Block const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_164(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_165(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 166 + * @symbol __unk_vfn_166 + */ + virtual void __unk_vfn_166(); + /** + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_169(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_173(); /** - * @vftbl 190 + * @vftbl 177 + * @symbol __unk_vfn_177 + */ + virtual void __unk_vfn_177(); + /** + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 189 * @symbol ?getResourceCount\@InfestedBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@InfestedBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0InfestedBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0InfestedBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ - MCAPI InfestedBlock(std::string const &, int, class Material const &); + MCAPI InfestedBlock(std::string const &, int); /** * @symbol ?spawnSilverfish\@InfestedBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/InfestedDeepslateBlock.hpp b/LiteLoader/include/llapi/mc/InfestedDeepslateBlock.hpp index e80dfe13a5..2b18ca1719 100644 --- a/LiteLoader/include/llapi/mc/InfestedDeepslateBlock.hpp +++ b/LiteLoader/include/llapi/mc/InfestedDeepslateBlock.hpp @@ -40,16 +40,21 @@ class InfestedDeepslateBlock : public RotatedPillarInfestedBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class InfestedDeepslateBlock : public RotatedPillarInfestedBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class InfestedDeepslateBlock : public RotatedPillarInfestedBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,110 +131,105 @@ class InfestedDeepslateBlock : public RotatedPillarInfestedBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 - */ - virtual void __unk_vfn_157(); - /** - * @vftbl 161 + * @vftbl 159 * @symbol ?tryGetUninfested\@InfestedDeepslateBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetUninfested(class Block const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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/InsidePowderSnowBlockSystem.hpp b/LiteLoader/include/llapi/mc/InsidePowderSnowBlockSystem.hpp index 9988a3389a..6dc81dc750 100644 --- a/LiteLoader/include/llapi/mc/InsidePowderSnowBlockSystem.hpp +++ b/LiteLoader/include/llapi/mc/InsidePowderSnowBlockSystem.hpp @@ -10,38 +10,27 @@ #undef BEFORE_EXTRA -/** - * @brief MC class InsidePowderSnowBlockSystem. - * - */ -class InsidePowderSnowBlockSystem { + +namespace InsidePowderSnowBlockSystem { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_INSIDEPOWDERSNOWBLOCKSYSTEM -public: - class InsidePowderSnowBlockSystem& operator=(class InsidePowderSnowBlockSystem const &) = delete; - InsidePowderSnowBlockSystem(class InsidePowderSnowBlockSystem const &) = delete; - InsidePowderSnowBlockSystem() = delete; -#endif - -public: /** - * @symbol ?createClientSideSpawnParticleSystem\@InsidePowderSnowBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createClientSideSpawnParticleSystem\@InsidePowderSnowBlockSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static struct TickingSystemWithInfo createClientSideSpawnParticleSystem(); + MCAPI struct TickingSystemWithInfo createClientSideSpawnParticleSystem(); /** - * @symbol ?createMovementSlowdownSystem\@InsidePowderSnowBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createMovementSlowdownSystem\@InsidePowderSnowBlockSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static struct TickingSystemWithInfo createMovementSlowdownSystem(); + MCAPI struct TickingSystemWithInfo createMovementSlowdownSystem(); /** - * @symbol ?createServerSideClearFireSystem\@InsidePowderSnowBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createServerSideClearFireSystem\@InsidePowderSnowBlockSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static struct TickingSystemWithInfo createServerSideClearFireSystem(); + MCAPI struct TickingSystemWithInfo createServerSideClearFireSystem(); /** - * @symbol ?createServerSideFreezingSystem\@InsidePowderSnowBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createServerSideFreezingSystem\@InsidePowderSnowBlockSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static struct TickingSystemWithInfo createServerSideFreezingSystem(); + 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 index 01ea761373..aea5d1a20a 100644 --- a/LiteLoader/include/llapi/mc/InsidePowderSnowBlockSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/InsidePowderSnowBlockSystemImpl.hpp @@ -36,8 +36,8 @@ class InsidePowderSnowBlockSystemImpl { */ 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\@\@\@\@\@\@U?$Exclude\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@U?$InsideBlockWithPosAndBlockComponent\@UPowderSnowBlockFlag\@\@\@\@\@\@U?$Exclude\@VFreezingComponent\@\@V?$FlagComponent\@UFreezeImmuneFlag\@\@\@\@\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Exclude\@V?$FlagComponent\@UIsDeadFlag\@\@\@\@\@\@$$CBUPlayerGameTypeComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@VFreezingComponent\@\@\@\@\@Z + * @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>, struct Exclude>>, class ViewT>, struct Exclude>, struct Include>, struct Exclude>, struct PlayerGameTypeComponent const>, class EntityModifierT); + 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/Int64Tag.hpp b/LiteLoader/include/llapi/mc/Int64Tag.hpp index e1e874619e..607627e6b7 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 ?write\@Int64Tag\@\@UEBAXAEAVIDataOutput\@\@\@Z + * @symbol __unk_vfn_2 */ - virtual void write(class IDataOutput &) const; + virtual void __unk_vfn_2(); /** * @vftbl 3 * @symbol ?load\@Int64Tag\@\@UEAAXAEAVIDataInput\@\@\@Z @@ -79,6 +79,12 @@ 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 befcd16501..af7fea7ddf 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 ?write\@IntArrayTag\@\@UEBAXAEAVIDataOutput\@\@\@Z + * @symbol __unk_vfn_2 */ - virtual void write(class IDataOutput &) const; + virtual void __unk_vfn_2(); /** * @vftbl 3 * @symbol ?load\@IntArrayTag\@\@UEAAXAEAVIDataInput\@\@\@Z @@ -81,5 +81,11 @@ 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 index c17a100cd4..c47a76f6ea 100644 --- a/LiteLoader/include/llapi/mc/IntComponent.hpp +++ b/LiteLoader/include/llapi/mc/IntComponent.hpp @@ -24,10 +24,6 @@ struct IntComponent { #endif public: - /** - * @symbol ?toString\@IntComponent\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string toString() const; /** * @symbol ?getDiff\@IntComponent\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBU1\@0\@Z */ diff --git a/LiteLoader/include/llapi/mc/IntTag.hpp b/LiteLoader/include/llapi/mc/IntTag.hpp index af93e61513..9c5bf82758 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 ?write\@IntTag\@\@UEBAXAEAVIDataOutput\@\@\@Z + * @symbol __unk_vfn_2 */ - virtual void write(class IDataOutput &) const; + virtual void __unk_vfn_2(); /** * @vftbl 3 * @symbol ?load\@IntTag\@\@UEAAXAEAVIDataInput\@\@\@Z @@ -79,18 +79,22 @@ 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\@H\@Z - */ - MCAPI IntTag(int); /** * @symbol ??0IntTag\@\@QEAA\@XZ */ MCAPI IntTag(); + /** + * @symbol ??0IntTag\@\@QEAA\@H\@Z + */ + MCAPI IntTag(int); }; diff --git a/LiteLoader/include/llapi/mc/InteractPacket.hpp b/LiteLoader/include/llapi/mc/InteractPacket.hpp index ae9bf7c8a7..45ae07287f 100644 --- a/LiteLoader/include/llapi/mc/InteractPacket.hpp +++ b/LiteLoader/include/llapi/mc/InteractPacket.hpp @@ -51,9 +51,9 @@ class InteractPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@InteractPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@InteractPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 41b23f3d54..db4afd642d 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\@$$QEAU0\@\@Z - */ - MCAPI Interaction(struct Interaction &&); /** * @symbol ??0Interaction\@\@QEAA\@AEBU0\@\@Z */ MCAPI Interaction(struct Interaction const &); + /** + * @symbol ??0Interaction\@\@QEAA\@$$QEAU0\@\@Z + */ + MCAPI Interaction(struct Interaction &&); /** * @symbol ?addActorDefinitionIdentifierByName\@Interaction\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/InternalSystemInfo.hpp b/LiteLoader/include/llapi/mc/InternalSystemInfo.hpp index aff070e59c..1c31d9ebc5 100644 --- a/LiteLoader/include/llapi/mc/InternalSystemInfo.hpp +++ b/LiteLoader/include/llapi/mc/InternalSystemInfo.hpp @@ -27,6 +27,10 @@ struct InternalSystemInfo { #endif public: + /** + * @symbol ??0InternalSystemInfo\@\@QEAA\@$$QEAU0\@\@Z + */ + MCAPI InternalSystemInfo(struct InternalSystemInfo &&); /** * @symbol ??1InternalSystemInfo\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/Inventory.hpp b/LiteLoader/include/llapi/mc/Inventory.hpp index 77c3eb131c..51098d5c8c 100644 --- a/LiteLoader/include/llapi/mc/Inventory.hpp +++ b/LiteLoader/include/llapi/mc/Inventory.hpp @@ -51,37 +51,37 @@ class Inventory : public FillingContainer { */ virtual void setItemWithForceBalance(int, class ItemStack const &, bool); /** - * @vftbl 21 + * @vftbl 22 * @symbol ?getEmptySlotsCount\@Inventory\@\@UEBAHXZ */ virtual int getEmptySlotsCount() const; - /** - * @vftbl 24 - * @symbol __unk_vfn_24 - */ - virtual void __unk_vfn_24(); /** * @vftbl 25 * @symbol __unk_vfn_25 */ virtual void __unk_vfn_25(); /** - * @vftbl 35 + * @vftbl 26 + * @symbol __unk_vfn_26 + */ + virtual void __unk_vfn_26(); + /** + * @vftbl 36 * @symbol ?add\@Inventory\@\@UEAA_NAEAVItemStack\@\@\@Z */ virtual bool add(class ItemStack &); /** - * @vftbl 36 + * @vftbl 37 * @symbol ?canAdd\@Inventory\@\@UEBA_NAEBVItemStack\@\@\@Z */ virtual bool canAdd(class ItemStack const &) const; /** - * @vftbl 40 + * @vftbl 41 * @symbol ?getFirstEmptySlot\@Inventory\@\@UEBAHXZ */ virtual int getFirstEmptySlot() const; /** - * @vftbl 41 + * @vftbl 42 * @symbol ?setContainerSize\@Inventory\@\@UEAAXH\@Z */ virtual void setContainerSize(int); diff --git a/LiteLoader/include/llapi/mc/InventoryContentPacket.hpp b/LiteLoader/include/llapi/mc/InventoryContentPacket.hpp index 80fb8d88e2..6800fcee1e 100644 --- a/LiteLoader/include/llapi/mc/InventoryContentPacket.hpp +++ b/LiteLoader/include/llapi/mc/InventoryContentPacket.hpp @@ -51,9 +51,9 @@ class InventoryContentPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@InventoryContentPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@InventoryContentPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 816866d3f5..a5d8a2b7a0 100644 --- a/LiteLoader/include/llapi/mc/InventorySlotPacket.hpp +++ b/LiteLoader/include/llapi/mc/InventorySlotPacket.hpp @@ -51,9 +51,9 @@ class InventorySlotPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@InventorySlotPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@InventorySlotPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_INVENTORYSLOTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/InventorySource.hpp b/LiteLoader/include/llapi/mc/InventorySource.hpp index 3c08ada5f0..73d76d3302 100644 --- a/LiteLoader/include/llapi/mc/InventorySource.hpp +++ b/LiteLoader/include/llapi/mc/InventorySource.hpp @@ -62,9 +62,5 @@ class InventorySource { * @symbol ??8InventorySource\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class InventorySource const &) const; - /** - * @symbol ?toString\@InventorySource\@\@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/InventoryTransaction.hpp b/LiteLoader/include/llapi/mc/InventoryTransaction.hpp index 9db01fa484..9b121eefd9 100644 --- a/LiteLoader/include/llapi/mc/InventoryTransaction.hpp +++ b/LiteLoader/include/llapi/mc/InventoryTransaction.hpp @@ -69,6 +69,10 @@ class InventoryTransaction { * @symbol ?serialize\@InventoryTransaction\@\@QEBAXAEAVBinaryStream\@\@_N\@Z */ MCAPI void serialize(class BinaryStream &, bool) const; + /** + * @symbol ?verifyFull\@InventoryTransaction\@\@QEBA?AW4InventoryTransactionError\@\@AEAVPlayer\@\@_N\@Z + */ + MCAPI enum class InventoryTransactionError verifyFull(class Player &, bool) const; /** * @symbol ??1InventoryTransaction\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/InventoryTransactionPacket.hpp b/LiteLoader/include/llapi/mc/InventoryTransactionPacket.hpp index 0c2ddd20d5..aeec8ae5e0 100644 --- a/LiteLoader/include/llapi/mc/InventoryTransactionPacket.hpp +++ b/LiteLoader/include/llapi/mc/InventoryTransactionPacket.hpp @@ -57,9 +57,9 @@ class InventoryTransactionPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@InventoryTransactionPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@InventoryTransactionPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 ed6a01a579..7c80bb4e67 100644 --- a/LiteLoader/include/llapi/mc/InvisibleBlock.hpp +++ b/LiteLoader/include/llapi/mc/InvisibleBlock.hpp @@ -40,16 +40,21 @@ class InvisibleBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class InvisibleBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class InvisibleBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,110 +131,105 @@ class InvisibleBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 176 + * @vftbl 174 * @symbol ?clip\@InvisibleBlock\@\@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 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 f05b453ca2..f6aac49af3 100644 --- a/LiteLoader/include/llapi/mc/IronGolem.hpp +++ b/LiteLoader/include/llapi/mc/IronGolem.hpp @@ -37,165 +37,160 @@ class IronGolem : public Mob { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 80 + * @vftbl 78 * @symbol ?getShadowRadius\@IronGolem\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 141 + * @vftbl 139 * @symbol ?handleEntityEvent\@IronGolem\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 245 + * @vftbl 237 * @symbol ?die\@IronGolem\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 258 + * @vftbl 250 * @symbol ?updateEntitySpecificMolangVariables\@IronGolem\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 266 + * @vftbl 258 * @symbol ?_playStepSound\@IronGolem\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 283 + * @vftbl 275 * @symbol ?hurtEffects\@IronGolem\@\@UEAAXAEBVActorDamageSource\@\@M_N1\@Z */ virtual void hurtEffects(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 288 + * @vftbl 280 * @symbol ?aiStep\@IronGolem\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 304 + * @vftbl 296 * @symbol ?doHurtTarget\@IronGolem\@\@UEAA_NPEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z */ virtual bool doHurtTarget(class Actor *, enum class ActorDamageCause const &); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0IronGolem\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/IsPregnantDefinition.hpp b/LiteLoader/include/llapi/mc/IsPregnantDefinition.hpp new file mode 100644 index 0000000000..df377eb5a9 --- /dev/null +++ b/LiteLoader/include/llapi/mc/IsPregnantDefinition.hpp @@ -0,0 +1,41 @@ +/** + * @file IsPregnantDefinition.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "JsonUtil.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct IsPregnantDefinition { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ISPREGNANTDEFINITION +public: + struct IsPregnantDefinition& operator=(struct IsPregnantDefinition const &) = delete; + IsPregnantDefinition(struct IsPregnantDefinition const &) = delete; + IsPregnantDefinition() = delete; +#endif + +public: + /** + * @symbol ?initialize\@IsPregnantDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + */ + MCAPI void initialize(class EntityContext &) const; + /** + * @symbol ?uninitialize\@IsPregnantDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + */ + MCAPI void uninitialize(class EntityContext &) const; + /** + * @symbol ?buildSchema\@IsPregnantDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UIsPregnantDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + */ + MCAPI static void buildSchema(class std::shared_ptr> &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/Item.hpp b/LiteLoader/include/llapi/mc/Item.hpp index 9c61ac914b..8dcb4f6db4 100644 --- a/LiteLoader/include/llapi/mc/Item.hpp +++ b/LiteLoader/include/llapi/mc/Item.hpp @@ -44,9 +44,9 @@ class Tier { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?initServer\@Item\@\@UEAA_NAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @symbol ?initServer\@Item\@\@UEAA_NAEAVValue\@Json\@\@AEBVSemVersion\@\@_NAEBVExperiments\@\@\@Z */ - virtual bool initServer(class Json::Value &, class SemVersion const &); + virtual bool initServer(class Json::Value &, class SemVersion const &, bool, class Experiments const &); /** * @vftbl 2 * @symbol ?tearDown\@Item\@\@UEAAXXZ @@ -74,9 +74,9 @@ class Tier { virtual int getMaxUseDuration(class ItemStack const *) const; /** * @vftbl 7 - * @symbol __unk_vfn_7 + * @symbol ?isMusicDisk\@Item\@\@UEBA_NXZ */ - virtual void __unk_vfn_7(); + virtual bool isMusicDisk() const; /** * @vftbl 8 * @symbol ?hasTag\@Item\@\@UEBA_NAEBVHashedString\@\@\@Z @@ -134,9 +134,9 @@ class Tier { virtual bool isDyeable() const; /** * @vftbl 19 - * @symbol ?isDye\@Item\@\@UEBA_NXZ + * @symbol __unk_vfn_19 */ - virtual bool isDye() const; + virtual void __unk_vfn_19(); /** * @vftbl 20 * @symbol ?getItemColor\@Item\@\@UEBA?AW4ItemColor\@\@XZ @@ -614,91 +614,101 @@ class Tier { virtual enum class LevelSoundEvent getEquipSound() const; /** * @vftbl 115 - * @symbol ?isSameItem\@Item\@\@UEBA_NAEBVItemStackBase\@\@0\@Z + * @symbol __unk_vfn_115 */ - virtual bool isSameItem(class ItemStackBase const &, class ItemStackBase const &) const; + virtual void __unk_vfn_115(); /** * @vftbl 116 - * @symbol ?initClient\@Item\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @symbol __unk_vfn_116 */ - virtual void initClient(class Json::Value &, class SemVersion const &); + virtual void __unk_vfn_116(); /** * @vftbl 117 + * @symbol ?hasSameRelevantUserData\@Item\@\@UEBA_NAEBVItemStackBase\@\@0\@Z + */ + virtual bool hasSameRelevantUserData(class ItemStackBase const &, class ItemStackBase const &) const; + /** + * @vftbl 118 + * @symbol ?initClient\@Item\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@_NAEBVExperiments\@\@\@Z + */ + virtual void initClient(class Json::Value &, class SemVersion const &, bool, class Experiments const &); + /** + * @vftbl 119 * @symbol ?setIconInfo\@Item\@\@UEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ virtual class Item & setIconInfo(std::string const &, int); /** - * @vftbl 118 + * @vftbl 120 * @symbol ?getIconInfo\@Item\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 119 + * @vftbl 121 * @symbol ?getInteractText\@Item\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPlayer\@\@\@Z */ virtual std::string getInteractText(class Player const &) const; /** - * @vftbl 120 + * @vftbl 122 * @symbol ?getAnimationFrameFor\@Item\@\@UEBAHPEAVMob\@\@_NPEBVItemStack\@\@_N\@Z */ virtual int getAnimationFrameFor(class Mob *, bool, class ItemStack const *, bool) const; /** - * @vftbl 121 + * @vftbl 123 * @symbol ?isEmissive\@Item\@\@UEBA_NH\@Z */ virtual bool isEmissive(int) const; /** - * @vftbl 122 + * @vftbl 124 * @symbol ?getLightEmission\@Item\@\@UEBA?AUBrightness\@\@H\@Z */ virtual struct Brightness getLightEmission(int) const; /** - * @vftbl 123 + * @vftbl 125 * @symbol ?getIconYOffset\@Item\@\@UEBAHXZ */ virtual int getIconYOffset() const; /** - * @vftbl 124 + * @vftbl 126 * @symbol ?canBeCharged\@Item\@\@UEBA_NXZ */ virtual bool canBeCharged() const; /** - * @vftbl 125 + * @vftbl 127 * @symbol ?playSoundIncrementally\@Item\@\@UEBAXAEBVItemInstance\@\@AEAVMob\@\@\@Z */ virtual void playSoundIncrementally(class ItemInstance const &, class Mob &) const; /** - * @vftbl 126 + * @vftbl 128 * @symbol ?playSoundIncrementally\@Item\@\@UEBAXAEBVItemStack\@\@AEAVMob\@\@\@Z */ virtual void playSoundIncrementally(class ItemStack const &, class Mob &) const; /** - * @vftbl 127 - * @symbol ?getFurnaceBurnIntervalMultipler\@Item\@\@UEBAMAEBVItemStackBase\@\@\@Z + * @vftbl 129 + * @symbol ?getFurnaceBurnIntervalMultipler\@Item\@\@UEBAMXZ */ - virtual float getFurnaceBurnIntervalMultipler(class ItemStackBase const &) const; + virtual float getFurnaceBurnIntervalMultipler() const; /** - * @vftbl 128 + * @vftbl 130 * @symbol ?getFurnaceXPmultiplier\@Item\@\@UEBAMAEBVItemStackBase\@\@\@Z */ virtual float getFurnaceXPmultiplier(class ItemStackBase const &) const; /** - * @vftbl 129 + * @vftbl 131 * @symbol ?getAuxValuesDescription\@Item\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getAuxValuesDescription() const; /** - * @vftbl 130 + * @vftbl 132 * @symbol ?_checkUseOnPermissions\@Item\@\@EEBA_NAEAVActor\@\@AEAVItemStackBase\@\@AEBEAEBVBlockPos\@\@\@Z */ virtual bool _checkUseOnPermissions(class Actor &, class ItemStackBase &, unsigned char const &, class BlockPos const &) const; /** - * @vftbl 131 + * @vftbl 133 * @symbol ?_calculatePlacePos\@Item\@\@EEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 132 + * @vftbl 134 * @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; @@ -736,17 +746,21 @@ class Tier { */ MCVAPI bool isComponentBased() const; /** - * @symbol ?isMultiColorTinted\@Item\@\@UEBA_NAEBVItemStack\@\@\@Z + * @symbol ?isDye\@Item\@\@UEBA_NXZ */ - MCVAPI bool isMultiColorTinted(class ItemStack const &) const; + MCVAPI bool isDye() const; /** - * @symbol ?isMusicDisk\@Item\@\@UEBA_NXZ + * @symbol ?isMultiColorTinted\@Item\@\@UEBA_NAEBVItemStack\@\@\@Z */ - MCVAPI bool isMusicDisk() const; + MCVAPI bool isMultiColorTinted(class ItemStack const &) const; /** * @symbol ?isPattern\@Item\@\@UEBA_NXZ */ MCVAPI bool isPattern() const; + /** + * @symbol ?shouldSendInteractionGameEvents\@Item\@\@UEBA_NXZ + */ + MCVAPI bool shouldSendInteractionGameEvents() const; /** * @symbol ?showsDurabilityInCreative\@Item\@\@UEBA_NXZ */ @@ -755,6 +769,10 @@ class Tier { * @symbol ?uniqueAuxValues\@Item\@\@UEBA_NXZ */ MCVAPI bool uniqueAuxValues() const; + /** + * @symbol ?useInterruptedByAttacking\@Item\@\@UEBA_NXZ + */ + MCVAPI bool useInterruptedByAttacking() const; /** * @symbol __unk_destructor_-1 */ diff --git a/LiteLoader/include/llapi/mc/ItemActor.hpp b/LiteLoader/include/llapi/mc/ItemActor.hpp index 4fa8b0ad0a..2a8c764cd5 100644 --- a/LiteLoader/include/llapi/mc/ItemActor.hpp +++ b/LiteLoader/include/llapi/mc/ItemActor.hpp @@ -45,165 +45,160 @@ class ItemActor : public Actor { */ virtual void __unk_vfn_16(); /** - * @vftbl 21 + * @vftbl 20 * @symbol ?isRuntimePredictedMovementEnabled\@ItemActor\@\@UEBA_NXZ */ virtual bool isRuntimePredictedMovementEnabled() const; /** - * @vftbl 40 + * @vftbl 39 * @symbol ?isFireImmune\@ItemActor\@\@UEBA_NXZ */ virtual bool isFireImmune() const; /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 48 + * @vftbl 47 * @symbol ?tryCreateAddActorPacket\@ItemActor\@\@UEAA?AV?$unique_ptr\@VAddActorBasePacket\@\@U?$default_delete\@VAddActorBasePacket\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr tryCreateAddActorPacket(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 - */ - virtual void __unk_vfn_62(); - /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_61(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_68(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_80(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_86(); /** - * @vftbl 89 + * @vftbl 87 * @symbol ?playerTouch\@ItemActor\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void playerTouch(class Player &); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_94(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_97(); + /** + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 134 + * @vftbl 132 * @symbol ?isInvulnerableTo\@ItemActor\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 141 + * @vftbl 139 * @symbol ?handleEntityEvent\@ItemActor\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?getSourceUniqueID\@ItemActor\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 173 + * @vftbl 171 * @symbol ?getLiquidAABB\@ItemActor\@\@UEBA?AVAABB\@\@W4MaterialType\@\@\@Z */ virtual class AABB getLiquidAABB(enum class MaterialType) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 195 + * @vftbl 193 * @symbol ?canSynchronizeNewEntity\@ItemActor\@\@UEBA_NXZ */ virtual bool canSynchronizeNewEntity() const; /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@ItemActor\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@ItemActor\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@ItemActor\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); #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 ac392f8ffe..10e7d50489 100644 --- a/LiteLoader/include/llapi/mc/ItemChargeEvent.hpp +++ b/LiteLoader/include/llapi/mc/ItemChargeEvent.hpp @@ -34,6 +34,10 @@ 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 */ diff --git a/LiteLoader/include/llapi/mc/ItemComponent.hpp b/LiteLoader/include/llapi/mc/ItemComponent.hpp index 5c8061ef41..9a3e0f5d51 100644 --- a/LiteLoader/include/llapi/mc/ItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/ItemComponent.hpp @@ -41,9 +41,9 @@ class ItemComponent { virtual void __unk_vfn_1(); /** * @vftbl 2 - * @symbol ?writeSettings\@ItemComponent\@\@UEAAXXZ + * @symbol __unk_vfn_2 */ - virtual void writeSettings(); + virtual void __unk_vfn_2(); /** * @vftbl 3 * @symbol __unk_vfn_3 @@ -51,19 +51,26 @@ class ItemComponent { virtual void __unk_vfn_3(); /** * @vftbl 4 - * @symbol __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 * @symbol ?buildNetworkTag\@ItemComponent\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMCOMPONENT + /** + * @symbol ?_canUseOn\@ItemComponent\@\@MEBA_NAEBVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@E\@Z + */ + MCVAPI bool _canUseOn(class ItemStack const &, class Actor &, class BlockPos const &, unsigned char) const; + /** + * @symbol ?_useOn\@ItemComponent\@\@MEBA_NAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@\@Z + */ + MCVAPI bool _useOn(class ItemStack &, class Actor &, class BlockPos const &, unsigned char, class Vec3 const &) const; /** * @symbol ?checkComponentDataForContentErrors\@ItemComponent\@\@UEBA_NXZ */ MCVAPI bool checkComponentDataForContentErrors() const; + /** + * @symbol ?handleVersionBasedInitialization\@ItemComponent\@\@UEAAXAEBVSemVersion\@\@\@Z + */ + MCVAPI void handleVersionBasedInitialization(class SemVersion const &); /** * @symbol ?initializeFromNetwork\@ItemComponent\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ @@ -73,9 +80,9 @@ class ItemComponent { */ MCVAPI bool isNetworkComponent() const; /** - * @symbol ?useOn\@ItemComponent\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?writeSettings\@ItemComponent\@\@UEAAXXZ */ - MCVAPI bool useOn(class ItemStack &, class Actor &, class BlockPos const &, unsigned char, class Vec3 const &) const; + MCVAPI void writeSettings(); /** * @symbol __unk_destructor_-1 */ @@ -85,6 +92,10 @@ class ItemComponent { * @symbol ??0ItemComponent\@\@QEAA\@PEAVComponentItem\@\@\@Z */ MCAPI ItemComponent(class ComponentItem *); + /** + * @symbol ?useOn\@ItemComponent\@\@QEBA_NAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@\@Z + */ + MCAPI bool useOn(class ItemStack &, class Actor &, class BlockPos const &, unsigned char, class Vec3 const &) const; /** * @symbol ?bindItemComponentType\@ItemComponent\@\@SAXXZ */ diff --git a/LiteLoader/include/llapi/mc/ItemComponentPacket.hpp b/LiteLoader/include/llapi/mc/ItemComponentPacket.hpp index 6ace18b909..ddaf433627 100644 --- a/LiteLoader/include/llapi/mc/ItemComponentPacket.hpp +++ b/LiteLoader/include/llapi/mc/ItemComponentPacket.hpp @@ -49,16 +49,11 @@ class ItemComponentPacket : public Packet { * @symbol ?write\@ItemComponentPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; - /** - * @vftbl 4 - * @symbol ?readExtended\@ItemComponentPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z - */ - virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &); /** * @vftbl 7 - * @symbol ?_read\@ItemComponentPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ItemComponentPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 af0fee45b0..93e91b76fc 100644 --- a/LiteLoader/include/llapi/mc/ItemContext.hpp +++ b/LiteLoader/include/llapi/mc/ItemContext.hpp @@ -49,9 +49,9 @@ class ItemContext { */ MCAPI class std::optional getId() const; /** - * @symbol ?getItem\@ItemContext\@\@QEBAAEBVItemStack\@\@XZ + * @symbol ?getItem\@ItemContext\@\@QEBA?AV?$optional\@VItemStack\@\@\@std\@\@XZ */ - MCAPI class ItemStack const & getItem() const; + MCAPI class std::optional getItem() const; /** * @symbol ?getKeepOnDeath\@ItemContext\@\@QEBA?AV?$optional\@_N\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ItemDescriptor.hpp b/LiteLoader/include/llapi/mc/ItemDescriptor.hpp index b7bc93418b..55ced9120d 100644 --- a/LiteLoader/include/llapi/mc/ItemDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/ItemDescriptor.hpp @@ -55,6 +55,10 @@ class ItemDescriptor { * @symbol ??0ItemDescriptor\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@H\@Z */ MCAPI ItemDescriptor(class std::basic_string_view>, int); + /** + * @symbol ??0ItemDescriptor\@\@QEAA\@XZ + */ + MCAPI ItemDescriptor(); /** * @symbol ??0ItemDescriptor\@\@QEAA\@AEBV0\@\@Z */ @@ -64,33 +68,29 @@ class ItemDescriptor { */ MCAPI ItemDescriptor(class ReadOnlyBinaryStream &); /** - * @symbol ??0ItemDescriptor\@\@QEAA\@XZ + * @symbol ??0ItemDescriptor\@\@QEAA\@AEBVItem\@\@H\@Z */ - MCAPI ItemDescriptor(); + MCAPI ItemDescriptor(class Item const &, int); /** * @symbol ??0ItemDescriptor\@\@QEAA\@AEBUItemTag\@\@\@Z */ MCAPI ItemDescriptor(struct ItemTag const &); + /** + * @symbol ??0ItemDescriptor\@\@QEAA\@AEBVBlockLegacy\@\@\@Z + */ + MCAPI ItemDescriptor(class BlockLegacy const &); /** * @symbol ??0ItemDescriptor\@\@QEAA\@AEBVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ MCAPI ItemDescriptor(class Json::Value const &, class SemVersion const &); /** - * @symbol ??0ItemDescriptor\@\@QEAA\@AEBVItem\@\@H\@Z + * @symbol ??0ItemDescriptor\@\@QEAA\@AEBVBlock\@\@\@Z */ - MCAPI ItemDescriptor(class Item const &, int); + MCAPI ItemDescriptor(class Block const &); /** * @symbol ??0ItemDescriptor\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI ItemDescriptor(class ItemDescriptor &&); - /** - * @symbol ??0ItemDescriptor\@\@QEAA\@AEBVBlockLegacy\@\@\@Z - */ - MCAPI ItemDescriptor(class BlockLegacy const &); - /** - * @symbol ??0ItemDescriptor\@\@QEAA\@AEBVBlock\@\@\@Z - */ - MCAPI ItemDescriptor(class Block const &); /** * @symbol ?forEachItemUntil\@ItemDescriptor\@\@QEBA_NV?$function\@$$A6A_NAEBVItem\@\@F\@Z\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemDescriptorCount.hpp b/LiteLoader/include/llapi/mc/ItemDescriptorCount.hpp index 30ad562416..afa3cef63f 100644 --- a/LiteLoader/include/llapi/mc/ItemDescriptorCount.hpp +++ b/LiteLoader/include/llapi/mc/ItemDescriptorCount.hpp @@ -53,13 +53,13 @@ class ItemDescriptorCount : public ItemDescriptor { */ MCAPI ItemDescriptorCount(class ReadOnlyBinaryStream &); /** - * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBVBlockLegacy\@\@G\@Z */ - MCAPI ItemDescriptorCount(class ItemDescriptorCount const &); + MCAPI ItemDescriptorCount(class BlockLegacy const &, unsigned short); /** - * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBVBlock\@\@G\@Z + * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBV0\@\@Z */ - MCAPI ItemDescriptorCount(class Block const &, unsigned short); + MCAPI ItemDescriptorCount(class ItemDescriptorCount const &); /** * @symbol ??0ItemDescriptorCount\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@HG\@Z */ @@ -68,6 +68,10 @@ 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 */ @@ -77,13 +81,9 @@ class ItemDescriptorCount : public ItemDescriptor { */ MCAPI ItemDescriptorCount(class ItemDescriptor const &, unsigned short); /** - * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBVBlockLegacy\@\@G\@Z - */ - MCAPI ItemDescriptorCount(class BlockLegacy const &, unsigned short); - /** - * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBUItemTag\@\@G\@Z + * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBVBlock\@\@G\@Z */ - MCAPI ItemDescriptorCount(struct ItemTag const &, unsigned short); + MCAPI ItemDescriptorCount(class Block const &, unsigned short); /** * @symbol ?getStackSize\@ItemDescriptorCount\@\@QEBAFXZ */ diff --git a/LiteLoader/include/llapi/mc/ItemEventCoordinator.hpp b/LiteLoader/include/llapi/mc/ItemEventCoordinator.hpp index 030636d595..9d944cdfcc 100644 --- a/LiteLoader/include/llapi/mc/ItemEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/ItemEventCoordinator.hpp @@ -5,6 +5,8 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Tag.hpp" +#include "Int64Tag.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -15,7 +17,7 @@ * @brief MC class ItemEventCoordinator. * */ -class ItemEventCoordinator { +class ItemEventCoordinator : public Int64Tag { #define AFTER_EXTRA // Add Member There @@ -28,6 +30,340 @@ class ItemEventCoordinator { #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 b1b8abbdfe..f1692e8881 100644 --- a/LiteLoader/include/llapi/mc/ItemFrameBlock.hpp +++ b/LiteLoader/include/llapi/mc/ItemFrameBlock.hpp @@ -45,16 +45,21 @@ class ItemFrameBlock : public ActorBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -67,14 +72,14 @@ class ItemFrameBlock : public ActorBlock { virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol __unk_vfn_34 + * @symbol ?isWaterBlocking\@ItemFrameBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_34(); + virtual bool isWaterBlocking() const; /** * @vftbl 35 - * @symbol ?isWaterBlocking\@ItemFrameBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_35 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +111,10 @@ class ItemFrameBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,15 +141,15 @@ class ItemFrameBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -152,181 +157,176 @@ class ItemFrameBlock : public ActorBlock { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@ItemFrameBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 91 + * @vftbl 90 * @symbol ?mayPlace\@ItemFrameBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 98 + * @vftbl 97 * @symbol ?getIgnoresDestroyPermissions\@ItemFrameBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@\@Z */ virtual bool getIgnoresDestroyPermissions(class Actor &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@ItemFrameBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 101 + * @vftbl 100 * @symbol ?playerWillDestroy\@ItemFrameBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 102 + * @vftbl 101 * @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 103 + * @vftbl 102 * @symbol ?asItemInstance\@ItemFrameBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 109 + * @vftbl 108 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 127 + * @vftbl 125 * @symbol ?getComparatorSignal\@ItemFrameBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@ItemFrameBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@ItemFrameBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@ItemFrameBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@ItemFrameBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@ItemFrameBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@ItemFrameBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@ItemFrameBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 195 + * @vftbl 194 * @symbol ?getEntityResourceItem\@ItemFrameBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z */ virtual class ItemInstance getEntityResourceItem(class Randomize &, class BlockActor const &, int) const; /** - * @vftbl 196 + * @vftbl 195 * @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 d5b16dc26c..2e201a3dd3 100644 --- a/LiteLoader/include/llapi/mc/ItemFrameBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ItemFrameBlockActor.hpp @@ -101,17 +101,17 @@ class ItemFrameBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); /** - * @vftbl 37 + * @vftbl 39 * @symbol ?_getUpdatePacket\@ItemFrameBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 38 + * @vftbl 40 * @symbol ?_onUpdatePacket\@ItemFrameBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/ItemFrameDropItemPacket.hpp b/LiteLoader/include/llapi/mc/ItemFrameDropItemPacket.hpp index dd924e39b3..d2617e54ab 100644 --- a/LiteLoader/include/llapi/mc/ItemFrameDropItemPacket.hpp +++ b/LiteLoader/include/llapi/mc/ItemFrameDropItemPacket.hpp @@ -51,9 +51,9 @@ class ItemFrameDropItemPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ItemFrameDropItemPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ItemFrameDropItemPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMFRAMEDROPITEMPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ItemInstance.hpp b/LiteLoader/include/llapi/mc/ItemInstance.hpp index f08141be4e..db549ed190 100644 --- a/LiteLoader/include/llapi/mc/ItemInstance.hpp +++ b/LiteLoader/include/llapi/mc/ItemInstance.hpp @@ -53,10 +53,6 @@ class ItemInstance : public ItemStackBase { * @symbol ??0ItemInstance\@\@QEAA\@XZ */ MCAPI ItemInstance(); - /** - * @symbol ??0ItemInstance\@\@QEAA\@AEBVBlock\@\@HPEBVCompoundTag\@\@\@Z - */ - MCAPI ItemInstance(class Block const &, int, class CompoundTag const *); /** * @symbol ??0ItemInstance\@\@QEAA\@AEBV0\@\@Z */ @@ -66,13 +62,17 @@ class ItemInstance : public ItemStackBase { */ MCAPI ItemInstance(class ItemStackBase const &); /** - * @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\@AEBVBlockLegacy\@\@H\@Z */ MCAPI ItemInstance(class BlockLegacy const &, int); + /** + * @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\@AEBVItem\@\@HHPEBVCompoundTag\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemRegistry.hpp b/LiteLoader/include/llapi/mc/ItemRegistry.hpp index 34b1000b5a..01cc6de4b7 100644 --- a/LiteLoader/include/llapi/mc/ItemRegistry.hpp +++ b/LiteLoader/include/llapi/mc/ItemRegistry.hpp @@ -61,17 +61,17 @@ struct ComplexAlias { //private: /** - * @symbol ?_loadItemData\@ItemRegistry\@\@AEAAXAEAVResourcePackManager\@\@V?$function\@$$A6AXAEAV?$WeakPtr\@VItem\@\@\@\@AEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z\@std\@\@_NW4ItemVersion\@\@\@Z + * @symbol ?_loadItemData\@ItemRegistry\@\@AEAAXAEAVResourcePackManager\@\@V?$function\@$$A6AXAEAV?$WeakPtr\@VItem\@\@\@\@AEAVValue\@Json\@\@AEBVSemVersion\@\@_NAEBVExperiments\@\@\@Z\@std\@\@AEBVExperiments\@\@W4ItemVersion\@\@\@Z */ - MCAPI void _loadItemData(class ResourcePackManager &, class std::function &, class Json::Value &, class SemVersion const &)>, bool, enum class ItemVersion); + MCAPI void _loadItemData(class ResourcePackManager &, class std::function &, class Json::Value &, class SemVersion const &, bool, class Experiments const &)>, class Experiments const &, enum class ItemVersion); /** - * @symbol ?_loadItemDefinition\@ItemRegistry\@\@AEAAXAEAVValue\@Json\@\@_NV?$function\@$$A6AXAEAV?$WeakPtr\@VItem\@\@\@\@AEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z\@std\@\@1W4ItemVersion\@\@W4PackType\@\@\@Z + * @symbol ?_loadItemDefinition\@ItemRegistry\@\@AEAAXAEAVValue\@Json\@\@_NV?$function\@$$A6AXAEAV?$WeakPtr\@VItem\@\@\@\@AEAVValue\@Json\@\@AEBVSemVersion\@\@_NAEBVExperiments\@\@\@Z\@std\@\@AEBVExperiments\@\@W4ItemVersion\@\@W4PackType\@\@\@Z */ - MCAPI void _loadItemDefinition(class Json::Value &, bool, class std::function &, class Json::Value &, class SemVersion const &)>, bool, enum class ItemVersion, enum class PackType); + MCAPI void _loadItemDefinition(class Json::Value &, bool, class std::function &, class Json::Value &, class SemVersion const &, bool, class Experiments const &)>, class Experiments const &, enum class ItemVersion, enum class PackType); /** - * @symbol ?_parseItemDefinition\@ItemRegistry\@\@AEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@_NV?$function\@$$A6AXAEAV?$WeakPtr\@VItem\@\@\@\@AEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z\@3\@1W4ItemVersion\@\@W4PackType\@\@\@Z + * @symbol ?_parseItemDefinition\@ItemRegistry\@\@AEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@_NV?$function\@$$A6AXAEAV?$WeakPtr\@VItem\@\@\@\@AEAVValue\@Json\@\@AEBVSemVersion\@\@_NAEBVExperiments\@\@\@Z\@3\@AEBVExperiments\@\@W4ItemVersion\@\@W4PackType\@\@\@Z */ - MCAPI std::string _parseItemDefinition(std::string const &, bool, class std::function &, class Json::Value &, class SemVersion const &)>, bool, enum class ItemVersion, enum class PackType); + MCAPI std::string _parseItemDefinition(std::string const &, bool, class std::function &, class Json::Value &, class SemVersion const &, bool, class Experiments const &)>, class Experiments const &, enum class ItemVersion, enum class PackType); /** * @symbol ?addItemToTagMap\@ItemRegistry\@\@AEAAXAEBVItem\@\@\@Z */ @@ -117,9 +117,9 @@ struct ComplexAlias { */ MCAPI void initServerData(class ResourcePackManager &, class Experiments const &, enum class ItemVersion); /** - * @symbol ?isComponentBasedItemSchema\@ItemRegistry\@\@AEAA_NAEBVSemVersion\@\@\@Z + * @symbol ?isComponentBasedItemSchema\@ItemRegistry\@\@AEAA_NAEBVSemVersion\@\@AEBVValue\@Json\@\@\@Z */ - MCAPI bool isComponentBasedItemSchema(class SemVersion const &); + MCAPI bool isComponentBasedItemSchema(class SemVersion const &, class Json::Value const &); /** * @symbol ?lookupByName\@ItemRegistry\@\@AEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemRegistryRef.hpp b/LiteLoader/include/llapi/mc/ItemRegistryRef.hpp index be8f8bccd4..118bf678d8 100644 --- a/LiteLoader/include/llapi/mc/ItemRegistryRef.hpp +++ b/LiteLoader/include/llapi/mc/ItemRegistryRef.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Json.hpp" #include "ItemRegistry.hpp" #define BEFORE_EXTRA @@ -57,9 +58,9 @@ class ItemRegistryRef { */ MCAPI void digestServerItemComponents(std::vector> const &) const; /** - * @symbol ?getComplexAliasSplitNames\@ItemRegistryRef\@\@QEBAAEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@std\@\@AEBVHashedString\@\@\@Z + * @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; + MCAPI std::vector> const & getComplexAliasSplitNames(class HashedString const &) const; /** * @symbol ?getItem\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z */ @@ -101,9 +102,9 @@ class ItemRegistryRef { */ MCAPI bool isComplexAlias(class HashedString const &) const; /** - * @symbol ?isComponentBasedItemSchema\@ItemRegistryRef\@\@QEBA_NAEBVSemVersion\@\@\@Z + * @symbol ?isComponentBasedItemSchema\@ItemRegistryRef\@\@QEBA_NAEBVSemVersion\@\@AEBVValue\@Json\@\@\@Z */ - MCAPI bool isComponentBasedItemSchema(class SemVersion const &) const; + MCAPI bool isComponentBasedItemSchema(class SemVersion const &, class Json::Value const &) const; /** * @symbol ?isCreativeItem\@ItemRegistryRef\@\@QEBA_NAEBVItemInstance\@\@\@Z */ @@ -120,14 +121,14 @@ class ItemRegistryRef { * @symbol ?lookupByName\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEAH0V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ MCAPI class WeakPtr lookupByName(int &, int &, class std::basic_string_view>) const; - /** - * @symbol ?lookupByName\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z - */ - 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 + */ + MCAPI class WeakPtr lookupByName(class HashedString const &) 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/ItemStack.hpp b/LiteLoader/include/llapi/mc/ItemStack.hpp index ad4951d1bc..471e5e6deb 100644 --- a/LiteLoader/include/llapi/mc/ItemStack.hpp +++ b/LiteLoader/include/llapi/mc/ItemStack.hpp @@ -105,22 +105,18 @@ class ItemStack : public ItemStackBase { */ MCVAPI ~ItemStack(); #endif - /** - * @symbol ??0ItemStack\@\@QEAA\@AEBVRecipeIngredient\@\@\@Z - */ - MCAPI ItemStack(class RecipeIngredient const &); /** * @symbol ??0ItemStack\@\@QEAA\@AEBVItemInstance\@\@\@Z */ MCAPI ItemStack(class ItemInstance const &); /** - * @symbol ??0ItemStack\@\@QEAA\@XZ + * @symbol ??0ItemStack\@\@QEAA\@AEBVRecipeIngredient\@\@\@Z */ - MCAPI ItemStack(); + MCAPI ItemStack(class RecipeIngredient const &); /** - * @symbol ??0ItemStack\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@HHPEBVCompoundTag\@\@\@Z + * @symbol ??0ItemStack\@\@QEAA\@XZ */ - MCAPI ItemStack(class std::basic_string_view>, int, int, class CompoundTag const *); + MCAPI ItemStack(); /** * @symbol ??0ItemStack\@\@QEAA\@AEBVItem\@\@HHPEBVCompoundTag\@\@\@Z */ @@ -129,6 +125,10 @@ class ItemStack : public ItemStackBase { * @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 */ diff --git a/LiteLoader/include/llapi/mc/ItemStackBase.hpp b/LiteLoader/include/llapi/mc/ItemStackBase.hpp index 718f7b126f..87e560c47a 100644 --- a/LiteLoader/include/llapi/mc/ItemStackBase.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackBase.hpp @@ -26,6 +26,7 @@ class ItemStackBase { char filler[128]; public: + struct ComparisonOptions; LIAPI int getCount() const; inline int getCountNoCheck() const { @@ -251,14 +252,14 @@ class ItemStackBase { * @symbol ?getUseAnimation\@ItemStackBase\@\@QEBA?AW4UseAnimation\@\@XZ */ MCAPI enum class UseAnimation getUseAnimation() const; - /** - * @symbol ?getUserData\@ItemStackBase\@\@QEAAPEAVCompoundTag\@\@XZ - */ - MCAPI class CompoundTag * getUserData(); /** * @symbol ?getUserData\@ItemStackBase\@\@QEBAPEBVCompoundTag\@\@XZ */ MCAPI class CompoundTag const * getUserData() const; + /** + * @symbol ?getUserData\@ItemStackBase\@\@QEAAPEAVCompoundTag\@\@XZ + */ + MCAPI class CompoundTag * getUserData(); /** * @symbol ?getWasPickedUp\@ItemStackBase\@\@QEBA_NXZ */ @@ -468,9 +469,9 @@ class ItemStackBase { */ MCAPI bool sameItem(int, int) const; /** - * @symbol ?sameItem\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z + * @symbol ?sameItem\@ItemStackBase\@\@QEBA_NAEBV1\@AEBUComparisonOptions\@1\@\@Z */ - MCAPI bool sameItem(class ItemStackBase const &) const; + MCAPI bool sameItem(class ItemStackBase const &, struct ItemStackBase::ComparisonOptions const &) const; /** * @symbol ?sameItemAndAux\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z */ @@ -567,6 +568,10 @@ class ItemStackBase { * @symbol ?updateComponent\@ItemStackBase\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@\@Z */ MCAPI bool updateComponent(std::string const &, class Json::Value const &); + /** + * @symbol ?COMPARISONOPTIONS_RELEVANTUSERDATA\@ItemStackBase\@\@2UComparisonOptions\@1\@B + */ + MCAPI static struct ItemStackBase::ComparisonOptions const COMPARISONOPTIONS_RELEVANTUSERDATA; /** * @symbol ?TAG_CAN_DESTROY\@ItemStackBase\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ @@ -601,6 +606,10 @@ class ItemStackBase { MCAPI static bool isValidComponent(std::string const &); //protected: + /** + * @symbol ??0ItemStackBase\@\@IEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@HHPEBVCompoundTag\@\@\@Z + */ + MCAPI ItemStackBase(class std::basic_string_view>, int, int, class CompoundTag const *); /** * @symbol ??0ItemStackBase\@\@IEAA\@AEBVItem\@\@HHPEBVCompoundTag\@\@\@Z */ @@ -613,18 +622,14 @@ class ItemStackBase { * @symbol ??0ItemStackBase\@\@IEAA\@XZ */ MCAPI ItemStackBase(); - /** - * @symbol ??0ItemStackBase\@\@IEAA\@AEBVBlock\@\@HPEBVCompoundTag\@\@\@Z - */ - MCAPI ItemStackBase(class Block const &, int, class CompoundTag const *); - /** - * @symbol ??0ItemStackBase\@\@IEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@HHPEBVCompoundTag\@\@\@Z - */ - MCAPI ItemStackBase(class std::basic_string_view>, int, int, class CompoundTag const *); /** * @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\@AEBVRecipeIngredient\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemStackNetIdVariant.hpp b/LiteLoader/include/llapi/mc/ItemStackNetIdVariant.hpp index b4aef8a093..4f2522ea7a 100644 --- a/LiteLoader/include/llapi/mc/ItemStackNetIdVariant.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackNetIdVariant.hpp @@ -34,10 +34,6 @@ struct ItemStackNetIdVariant { #undef AFTER_EXTRA public: - /** - * @symbol ??0ItemStackNetIdVariant\@\@QEAA\@XZ - */ - MCAPI ItemStackNetIdVariant(); /** * @symbol ??0ItemStackNetIdVariant\@\@QEAA\@$$QEAU0\@\@Z */ @@ -46,6 +42,10 @@ struct ItemStackNetIdVariant { * @symbol ??0ItemStackNetIdVariant\@\@QEAA\@AEBU0\@\@Z */ MCAPI ItemStackNetIdVariant(struct ItemStackNetIdVariant const &); + /** + * @symbol ??0ItemStackNetIdVariant\@\@QEAA\@XZ + */ + MCAPI ItemStackNetIdVariant(); /** * @symbol ?deserialize\@ItemStackNetIdVariant\@\@QEAAXAEAVReadOnlyBinaryStream\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestAction.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestAction.hpp index 6ba63769e4..b742a88130 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestAction.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestAction.hpp @@ -69,10 +69,6 @@ class ItemStackRequestAction { * @symbol ?getActionType\@ItemStackRequestAction\@\@QEBA?AW4ItemStackRequestActionType\@\@XZ */ MCAPI enum class ItemStackRequestActionType getActionType() const; - /** - * @symbol ?write\@ItemStackRequestAction\@\@QEBAXAEAVBinaryStream\@\@\@Z - */ - MCAPI void write(class BinaryStream &) const; /** * @symbol ?getActionTypeName\@ItemStackRequestAction\@\@SA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ItemStackRequestActionType\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionBeaconPayment.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionBeaconPayment.hpp index 4e2f72b1a4..dce09cb65b 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionBeaconPayment.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionBeaconPayment.hpp @@ -59,13 +59,5 @@ class ItemStackRequestActionBeaconPayment { * @symbol ?_read\@ItemStackRequestActionBeaconPayment\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z */ virtual bool _read(class ReadOnlyBinaryStream &); - /** - * @symbol ?getPrimaryEffectId\@ItemStackRequestActionBeaconPayment\@\@QEBAHXZ - */ - MCAPI int getPrimaryEffectId() const; - /** - * @symbol ?getSecondaryEffectId\@ItemStackRequestActionBeaconPayment\@\@QEBAHXZ - */ - MCAPI int getSecondaryEffectId() const; }; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftHandler.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftHandler.hpp index f1346fd659..9aca49a46c 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftHandler.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftHandler.hpp @@ -33,6 +33,10 @@ 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 */ @@ -41,6 +45,10 @@ 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/ItemStackRequestActionCraftRecipeAuto.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftRecipeAuto.hpp index 3cfdd5a137..077f80e7e8 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftRecipeAuto.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftRecipeAuto.hpp @@ -62,5 +62,13 @@ class ItemStackRequestActionCraftRecipeAuto { * @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/ItemStackRequestActionMineBlock.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionMineBlock.hpp index f79a375f84..906c2c5d3b 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionMineBlock.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionMineBlock.hpp @@ -61,14 +61,6 @@ enum class PreValidationStatus; * @symbol ?_read\@ItemStackRequestActionMineBlock\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z */ virtual bool _read(class ReadOnlyBinaryStream &); - /** - * @symbol ?getPreValidationStatus\@ItemStackRequestActionMineBlock\@\@QEBA?AW4PreValidationStatus\@1\@XZ - */ - MCAPI enum class ItemStackRequestActionMineBlock::PreValidationStatus getPreValidationStatus() const; - /** - * @symbol ?getPredictedDurability\@ItemStackRequestActionMineBlock\@\@QEBAHXZ - */ - MCAPI int getPredictedDurability() const; /** * @symbol ?getSrc\@ItemStackRequestActionMineBlock\@\@QEBA?AUItemStackRequestSlotInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestBatch.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestBatch.hpp index e9af5f8b49..eefa092630 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestBatch.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestBatch.hpp @@ -29,14 +29,6 @@ class ItemStackRequestBatch { #endif public: - /** - * @symbol ?getRequests\@ItemStackRequestBatch\@\@QEBAAEBV?$vector\@V?$unique_ptr\@VItemStackRequestData\@\@U?$default_delete\@VItemStackRequestData\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VItemStackRequestData\@\@U?$default_delete\@VItemStackRequestData\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ - */ - MCAPI std::vector> const & getRequests() const; - /** - * @symbol ?takeRequests\@ItemStackRequestBatch\@\@QEBA?AV?$vector\@V?$unique_ptr\@VItemStackRequestData\@\@U?$default_delete\@VItemStackRequestData\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VItemStackRequestData\@\@U?$default_delete\@VItemStackRequestData\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ - */ - MCAPI std::vector> takeRequests() const; /** * @symbol ?write\@ItemStackRequestBatch\@\@QEBAXAEAVBinaryStream\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestData.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestData.hpp index b5d27d1ad3..383858d533 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestData.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestData.hpp @@ -29,26 +29,6 @@ class ItemStackRequestData { #endif public: - /** - * @symbol ?getActions\@ItemStackRequestData\@\@QEBAAEBV?$vector\@V?$unique_ptr\@VItemStackRequestAction\@\@U?$default_delete\@VItemStackRequestAction\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VItemStackRequestAction\@\@U?$default_delete\@VItemStackRequestAction\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ - */ - MCAPI std::vector> const & getActions() const; - /** - * @symbol ?getRequestId\@ItemStackRequestData\@\@QEBAAEBV?$TypedClientNetId\@UItemStackRequestIdTag\@\@H$0A\@\@\@XZ - */ - MCAPI class TypedClientNetId const & getRequestId() const; - /** - * @symbol ?getStringsToFilter\@ItemStackRequestData\@\@QEBAAEBV?$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 const & getStringsToFilter() const; - /** - * @symbol ?getStringsToFilterOrigin\@ItemStackRequestData\@\@QEBAAEBW4TextProcessingEventOrigin\@\@XZ - */ - MCAPI enum class TextProcessingEventOrigin const & getStringsToFilterOrigin() const; - /** - * @symbol ?postLoadItems\@ItemStackRequestData\@\@QEAAXAEAVBlockPalette\@\@_N\@Z - */ - MCAPI void postLoadItems(class BlockPalette &, bool); /** * @symbol ?tryFindAction\@ItemStackRequestData\@\@QEBAPEBVItemStackRequestAction\@\@W4ItemStackRequestActionType\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestPacket.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestPacket.hpp index f066e1651b..789af822c3 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestPacket.hpp @@ -51,9 +51,9 @@ class ItemStackRequestPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ItemStackRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ItemStackRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ItemStackRequestPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ItemStackResponsePacket.hpp b/LiteLoader/include/llapi/mc/ItemStackResponsePacket.hpp index a5dcb06188..aedf6b9a02 100644 --- a/LiteLoader/include/llapi/mc/ItemStackResponsePacket.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackResponsePacket.hpp @@ -51,9 +51,9 @@ class ItemStackResponsePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ItemStackResponsePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ItemStackResponsePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMSTACKRESPONSEPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ItemTransactionLogger.hpp b/LiteLoader/include/llapi/mc/ItemTransactionLogger.hpp index 3b59677f13..f36a83a831 100644 --- a/LiteLoader/include/llapi/mc/ItemTransactionLogger.hpp +++ b/LiteLoader/include/llapi/mc/ItemTransactionLogger.hpp @@ -25,10 +25,6 @@ namespace ItemTransactionLogger { * @symbol ?initializeLogger\@ItemTransactionLogger\@\@YAX_N\@Z */ MCAPI void initializeLogger(bool); - /** - * @symbol ?log\@ItemTransactionLogger\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI void log(std::string const &); /** * @symbol ?log\@ItemTransactionLogger\@\@YAXAEBVInventoryAction\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ @@ -41,6 +37,10 @@ namespace ItemTransactionLogger { * @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 + */ + MCAPI void log(std::string const &); /** * @symbol ?log\@ItemTransactionLogger\@\@YAXAEBVItemStackResponsePacket\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemUseOnEvent.hpp b/LiteLoader/include/llapi/mc/ItemUseOnEvent.hpp index d983c93281..fda4f76ebd 100644 --- a/LiteLoader/include/llapi/mc/ItemUseOnEvent.hpp +++ b/LiteLoader/include/llapi/mc/ItemUseOnEvent.hpp @@ -26,6 +26,10 @@ struct ItemUseOnEvent { #endif public: + /** + * @symbol ??0ItemUseOnEvent\@\@QEAA\@$$QEAU0\@\@Z + */ + MCAPI ItemUseOnEvent(struct ItemUseOnEvent &&); /** * @symbol ??0ItemUseOnEvent\@\@QEAA\@AEBU0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemUsedOnEvent.hpp b/LiteLoader/include/llapi/mc/ItemUsedOnEvent.hpp new file mode 100644 index 0000000000..07b36b422b --- /dev/null +++ b/LiteLoader/include/llapi/mc/ItemUsedOnEvent.hpp @@ -0,0 +1,32 @@ +/** + * @file ItemUsedOnEvent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct ItemUsedOnEvent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ITEMUSEDONEVENT +public: + struct ItemUsedOnEvent& operator=(struct ItemUsedOnEvent const &) = delete; + ItemUsedOnEvent(struct ItemUsedOnEvent const &) = delete; + ItemUsedOnEvent() = delete; +#endif + +public: + /** + * @symbol ??1ItemUsedOnEvent\@\@QEAA\@XZ + */ + MCAPI ~ItemUsedOnEvent(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/JigsawBlock.hpp b/LiteLoader/include/llapi/mc/JigsawBlock.hpp index 5ed7b21cd4..43b5068c5f 100644 --- a/LiteLoader/include/llapi/mc/JigsawBlock.hpp +++ b/LiteLoader/include/llapi/mc/JigsawBlock.hpp @@ -40,16 +40,21 @@ class JigsawBlock : public ActorBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class JigsawBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class JigsawBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,137 +131,132 @@ class JigsawBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 66 + * @vftbl 65 * @symbol ?canBeUsedInCommands\@JigsawBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 149 + * @vftbl 147 * @symbol ?getRenderBlock\@JigsawBlock\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getRenderBlock() const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?getMappedFace\@JigsawBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 151 + * @vftbl 149 * @symbol ?getFaceFlip\@JigsawBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z */ virtual enum class Flip getFaceFlip(unsigned char, class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@JigsawBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 190 + * @vftbl 189 * @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 21019b131a..a0f1fecded 100644 --- a/LiteLoader/include/llapi/mc/JigsawBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/JigsawBlockActor.hpp @@ -82,16 +82,26 @@ class JigsawBlockActor : public BlockActor { virtual void __unk_vfn_35(); /** * @vftbl 36 - * @symbol __unk_vfn_36 + * @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 void __unk_vfn_36(); + virtual std::vector getUgcStrings(class CompoundTag const &) const; /** * @vftbl 37 + * @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 + */ + virtual void __unk_vfn_38(); + /** + * @vftbl 39 * @symbol ?_getUpdatePacket\@JigsawBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 38 + * @vftbl 40 * @symbol ?_onUpdatePacket\@JigsawBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/Json.hpp b/LiteLoader/include/llapi/mc/Json.hpp index 359cb2314b..14035ed7bb 100644 --- a/LiteLoader/include/llapi/mc/Json.hpp +++ b/LiteLoader/include/llapi/mc/Json.hpp @@ -476,14 +476,14 @@ class StyledWriter : public Writer { * @symbol ?valueToQuotedString\@Json\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBD\@Z */ MCAPI std::string valueToQuotedString(char const *); - /** - * @symbol ?valueToString\@Json\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_K\@Z - */ - MCAPI std::string valueToString(unsigned __int64); /** * @symbol ?valueToString\@Json\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_J\@Z */ MCAPI std::string valueToString(__int64); + /** + * @symbol ?valueToString\@Json\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_K\@Z + */ + MCAPI std::string valueToString(unsigned __int64); /** * @symbol ?valueToString\@Json\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@N\@Z */ diff --git a/LiteLoader/include/llapi/mc/JukeboxBlock.hpp b/LiteLoader/include/llapi/mc/JukeboxBlock.hpp index 3f0e9bad8e..75a1020e2d 100644 --- a/LiteLoader/include/llapi/mc/JukeboxBlock.hpp +++ b/LiteLoader/include/llapi/mc/JukeboxBlock.hpp @@ -40,16 +40,21 @@ class JukeboxBlock : public ActorBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class JukeboxBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class JukeboxBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,140 +131,135 @@ class JukeboxBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 51 + * @vftbl 50 * @symbol ?isSignalSource\@JukeboxBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_53(); + /** + * @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 64 + * @vftbl 63 * @symbol ?shouldConnectToRedstone\@JukeboxBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@JukeboxBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 + */ + virtual void __unk_vfn_81(); + /** + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 127 + * @vftbl 125 * @symbol ?getComparatorSignal\@JukeboxBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@JukeboxBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@JukeboxBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@JukeboxBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_JUKEBOXBLOCK /** * @symbol ?hasComparatorSignal\@JukeboxBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/JumpEndSystem.hpp b/LiteLoader/include/llapi/mc/JumpEndSystem.hpp index d69f987a89..84b3d8ec50 100644 --- a/LiteLoader/include/llapi/mc/JumpEndSystem.hpp +++ b/LiteLoader/include/llapi/mc/JumpEndSystem.hpp @@ -29,8 +29,8 @@ class JumpEndSystem { */ MCAPI static struct TickingSystemWithInfo create(); /** - * @symbol ?tick\@JumpEndSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@\@\@V?$Optional\@$$CBUVehicleComponent\@\@\@\@$$CBUStateVectorComponent\@\@UJumpTicksComponent\@\@UMobJumpComponent\@\@USynchedActorDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UParrotFlag\@\@\@\@\@\@$$CBUPassengerComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@V?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@Z + * @symbol ?tick\@JumpEndSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@V?$Optional\@$$CBUVehicleComponent\@\@\@\@$$CBUStateVectorComponent\@\@UJumpTicksComponent\@\@UMobJumpComponent\@\@USynchedActorDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UParrotFlag\@\@\@\@\@\@$$CBUPassengerComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@V?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@Z */ - MCAPI static void tick(class ViewT, class FlagComponent>, class Optional, struct StateVectorComponent const, struct JumpTicksComponent, struct MobJumpComponent, struct SynchedActorDataComponent>, class ViewT>, struct PassengerComponent const>, class EntityModifierT, class FlagComponent, class FlagComponent>); + MCAPI static void tick(class ViewT>, class Optional, struct StateVectorComponent const, struct JumpTicksComponent, struct MobJumpComponent, struct SynchedActorDataComponent>, class ViewT>, struct PassengerComponent const>, class EntityModifierT, class FlagComponent, class FlagComponent>); }; diff --git a/LiteLoader/include/llapi/mc/JumpInputSystem.hpp b/LiteLoader/include/llapi/mc/JumpInputSystem.hpp index fbf1e73775..7a75e9db9f 100644 --- a/LiteLoader/include/llapi/mc/JumpInputSystem.hpp +++ b/LiteLoader/include/llapi/mc/JumpInputSystem.hpp @@ -31,5 +31,13 @@ class JumpInputSystem { * @symbol ?createJumpInputSystem\@JumpInputSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createJumpInputSystem(); + /** + * @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 28e916ebfa..6cd2f96db6 100644 --- a/LiteLoader/include/llapi/mc/KelpBlock.hpp +++ b/LiteLoader/include/llapi/mc/KelpBlock.hpp @@ -45,16 +45,21 @@ class KelpBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class KelpBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class KelpBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,15 +136,15 @@ class KelpBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -147,151 +152,146 @@ class KelpBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@KelpBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@KelpBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 86 * @symbol ?mayConsumeFertilizer\@KelpBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@KelpBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@KelpBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@KelpBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@KelpBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 136 + * @vftbl 134 * @symbol ?getColor\@KelpBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 141 + * @vftbl 139 * @symbol ?onGraphicsModeChanged\@KelpBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@KelpBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@KelpBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@KelpBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @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/KeyFrameTransform.hpp b/LiteLoader/include/llapi/mc/KeyFrameTransform.hpp index d7ce15a1f2..b239afd39d 100644 --- a/LiteLoader/include/llapi/mc/KeyFrameTransform.hpp +++ b/LiteLoader/include/llapi/mc/KeyFrameTransform.hpp @@ -41,14 +41,14 @@ class KeyFrameTransform { * @symbol ?optimizeAndGetDataValues\@KeyFrameTransform\@\@QEAA_NAEAVVec3\@\@0\@Z */ MCAPI bool optimizeAndGetDataValues(class Vec3 &, class Vec3 &); - /** - * @symbol ?set\@KeyFrameTransform\@\@QEAAXAEBVExpressionNode\@\@\@Z - */ - MCAPI void set(class ExpressionNode const &); /** * @symbol ?set\@KeyFrameTransform\@\@QEAAXAEBVExpressionNode\@\@H\@Z */ MCAPI void set(class ExpressionNode const &, int); + /** + * @symbol ?set\@KeyFrameTransform\@\@QEAAXAEBVExpressionNode\@\@\@Z + */ + MCAPI void set(class ExpressionNode const &); /** * @symbol ??1KeyFrameTransform\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/KeyManager.hpp b/LiteLoader/include/llapi/mc/KeyManager.hpp index c29361f60b..5eab144731 100644 --- a/LiteLoader/include/llapi/mc/KeyManager.hpp +++ b/LiteLoader/include/llapi/mc/KeyManager.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Crypto.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/include/llapi/mc/KnockbackArmorUpdater.hpp b/LiteLoader/include/llapi/mc/KnockbackArmorUpdater.hpp index b7d99909fb..74d03ed84b 100644 --- a/LiteLoader/include/llapi/mc/KnockbackArmorUpdater.hpp +++ b/LiteLoader/include/llapi/mc/KnockbackArmorUpdater.hpp @@ -161,11 +161,6 @@ class KnockbackArmorUpdater { virtual void __unk_vfn_25(); /** * @vftbl 26 - * @symbol __unk_vfn_26 - */ - virtual void __unk_vfn_26(); - /** - * @vftbl 27 * @symbol ?onEvent\@KnockbackArmorUpdater\@\@UEAA?AW4EventResult\@\@AEBUActorEquippedArmorEvent\@\@\@Z */ virtual enum class EventResult onEvent(struct ActorEquippedArmorEvent const &); diff --git a/LiteLoader/include/llapi/mc/KnockbackResistanceItemComponent.hpp b/LiteLoader/include/llapi/mc/KnockbackResistanceItemComponent.hpp deleted file mode 100644 index 5daf072c94..0000000000 --- a/LiteLoader/include/llapi/mc/KnockbackResistanceItemComponent.hpp +++ /dev/null @@ -1,80 +0,0 @@ -/** - * @file KnockbackResistanceItemComponent.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 KnockbackResistanceItemComponent. - * - */ -class KnockbackResistanceItemComponent { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_KNOCKBACKRESISTANCEITEMCOMPONENT -public: - class KnockbackResistanceItemComponent& operator=(class KnockbackResistanceItemComponent const &) = delete; - KnockbackResistanceItemComponent(class KnockbackResistanceItemComponent const &) = delete; - KnockbackResistanceItemComponent() = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VKnockbackResistanceItemComponent\@\@\@\@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 __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 - * @symbol ?buildNetworkTag\@?$NetworkedItemComponent\@VKnockbackResistanceItemComponent\@\@\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ - */ - virtual std::unique_ptr buildNetworkTag() const; - /** - * @vftbl 6 - * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VKnockbackResistanceItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z - */ - virtual bool initializeFromNetwork(class CompoundTag const &); - /** - * @symbol ?getProtectionValue\@KnockbackResistanceItemComponent\@\@QEBAMXZ - */ - MCAPI float getProtectionValue() const; - /** - * @symbol ?bindType\@KnockbackResistanceItemComponent\@\@SAXXZ - */ - MCAPI static void bindType(); - /** - * @symbol ?getIdentifier\@KnockbackResistanceItemComponent\@\@SAAEBVHashedString\@\@XZ - */ - MCAPI static class HashedString const & getIdentifier(); - -}; diff --git a/LiteLoader/include/llapi/mc/LabTablePacket.hpp b/LiteLoader/include/llapi/mc/LabTablePacket.hpp index fee5bbc69c..11c03c9529 100644 --- a/LiteLoader/include/llapi/mc/LabTablePacket.hpp +++ b/LiteLoader/include/llapi/mc/LabTablePacket.hpp @@ -51,9 +51,9 @@ class LabTablePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@LabTablePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@LabTablePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LABTABLEPACKET /** * @symbol __unk_destructor_-1 @@ -64,13 +64,13 @@ class LabTablePacket : public Packet { * @symbol ??0LabTablePacket\@\@QEAA\@XZ */ MCAPI LabTablePacket(); - /** - * @symbol ??0LabTablePacket\@\@QEAA\@W4Type\@0\@AEBVBlockPos\@\@\@Z - */ - MCAPI LabTablePacket(enum class LabTablePacket::Type, class BlockPos const &); /** * @symbol ??0LabTablePacket\@\@QEAA\@AEBVBlockPos\@\@W4LabTableReactionType\@\@\@Z */ MCAPI LabTablePacket(class BlockPos const &, enum class LabTableReactionType); + /** + * @symbol ??0LabTablePacket\@\@QEAA\@W4Type\@0\@AEBVBlockPos\@\@\@Z + */ + MCAPI LabTablePacket(enum class LabTablePacket::Type, class BlockPos const &); }; diff --git a/LiteLoader/include/llapi/mc/LadderBlock.hpp b/LiteLoader/include/llapi/mc/LadderBlock.hpp index a2ca13ac82..46c621cb86 100644 --- a/LiteLoader/include/llapi/mc/LadderBlock.hpp +++ b/LiteLoader/include/llapi/mc/LadderBlock.hpp @@ -50,16 +50,21 @@ class LadderBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -72,14 +77,14 @@ class LadderBlock : public BlockLegacy { virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol __unk_vfn_34 + * @symbol ?isWaterBlocking\@LadderBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_34(); + virtual bool isWaterBlocking() const; /** * @vftbl 35 - * @symbol ?isWaterBlocking\@LadderBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_35 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -111,10 +116,10 @@ class LadderBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -141,20 +146,20 @@ class LadderBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 57 + * @vftbl 56 * @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 + */ + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -162,124 +167,119 @@ class LadderBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@LadderBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 91 + * @vftbl 90 * @symbol ?mayPlace\@LadderBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@LadderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@LadderBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@LadderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@LadderBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #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 ee83383cbf..208de953e0 100644 --- a/LiteLoader/include/llapi/mc/LanternBlock.hpp +++ b/LiteLoader/include/llapi/mc/LanternBlock.hpp @@ -40,16 +40,21 @@ class LanternBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class LanternBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class LanternBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,162 +131,157 @@ class LanternBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 69 + * @vftbl 68 * @symbol ?checkIsPathable\@LanternBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 76 + * @vftbl 75 * @symbol ?movedByPiston\@LanternBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void movedByPiston(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@LanternBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@LanternBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 101 + * @vftbl 100 * @symbol ?playerWillDestroy\@LanternBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@LanternBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@LanternBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@LanternBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 + * @vftbl 187 * @symbol ?playerDestroy\@LanternBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@LanternBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @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 f5330fa8f3..63c12fecef 100644 --- a/LiteLoader/include/llapi/mc/LargeFireball.hpp +++ b/LiteLoader/include/llapi/mc/LargeFireball.hpp @@ -37,115 +37,110 @@ class LargeFireball : public Fireball { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_267(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 269 + * @symbol __unk_vfn_269 */ - virtual void __unk_vfn_275(); - /** - * @vftbl 277 - * @symbol __unk_vfn_277 - */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_269(); /** * @symbol ??0LargeFireball\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LavaSlime.hpp b/LiteLoader/include/llapi/mc/LavaSlime.hpp index 385e9a92c6..bc44742ec2 100644 --- a/LiteLoader/include/llapi/mc/LavaSlime.hpp +++ b/LiteLoader/include/llapi/mc/LavaSlime.hpp @@ -42,172 +42,162 @@ class LavaSlime : public Slime { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 73 - * @symbol ?isInLava\@LavaSlime\@\@UEBA_NAEBVIConstBlockSource\@\@\@Z + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual bool isInLava(class IConstBlockSource const &) const; - /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** * @vftbl 85 - * @symbol __unk_vfn_85 - */ - virtual void __unk_vfn_85(); - /** - * @vftbl 87 * @symbol ?getBrightness\@LavaSlime\@\@UEBAMMAEBVIConstBlockSource\@\@\@Z */ virtual float getBrightness(float, class IConstBlockSource const &) const; /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_86(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_94(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_97(); /** - * @vftbl 104 + * @vftbl 102 * @symbol ?isOnFire\@LavaSlime\@\@MEBA_NXZ */ virtual bool isOnFire() const; + /** + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); - /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 293 + * @vftbl 285 * @symbol ?checkSpawnRules\@LavaSlime\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 310 + * @vftbl 302 * @symbol ?getArmorValue\@LavaSlime\@\@UEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 344 + * @vftbl 336 * @symbol ?jumpFromGround\@LavaSlime\@\@MEAAXAEBVIConstBlockSource\@\@\@Z */ virtual void jumpFromGround(class IConstBlockSource const &); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** - * @vftbl 353 + * @vftbl 345 * @symbol ?isDarkEnoughToSpawn\@LavaSlime\@\@UEBA_NXZ */ virtual bool isDarkEnoughToSpawn() const; /** - * @vftbl 357 + * @vftbl 349 * @symbol ?doPlayLandSound\@LavaSlime\@\@MEAA_NXZ */ virtual bool doPlayLandSound(); /** - * @vftbl 360 + * @vftbl 352 * @symbol ?decreaseSquish\@LavaSlime\@\@MEAAXXZ */ virtual void decreaseSquish(); /** - * @vftbl 361 + * @vftbl 353 * @symbol ?createChild\@LavaSlime\@\@MEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@H\@Z */ virtual class OwnerPtrT createChild(int); diff --git a/LiteLoader/include/llapi/mc/LayeredAbilities.hpp b/LiteLoader/include/llapi/mc/LayeredAbilities.hpp index a0625706b1..ae5f99d253 100644 --- a/LiteLoader/include/llapi/mc/LayeredAbilities.hpp +++ b/LiteLoader/include/llapi/mc/LayeredAbilities.hpp @@ -88,14 +88,14 @@ class LayeredAbilities { * @symbol ??4LayeredAbilities\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class LayeredAbilities & operator=(class LayeredAbilities const &); - /** - * @symbol ?setAbility\@LayeredAbilities\@\@QEAAXW4AbilitiesIndex\@\@_N\@Z - */ - MCAPI void setAbility(enum class AbilitiesIndex, bool); /** * @symbol ?setAbility\@LayeredAbilities\@\@QEAAXW4AbilitiesIndex\@\@M\@Z */ MCAPI void setAbility(enum class AbilitiesIndex, float); + /** + * @symbol ?setAbility\@LayeredAbilities\@\@QEAAXW4AbilitiesIndex\@\@_N\@Z + */ + MCAPI void setAbility(enum class AbilitiesIndex, bool); /** * @symbol ?setCommandPermissions\@LayeredAbilities\@\@QEAAXW4CommandPermissionLevel\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LeadItem.hpp b/LiteLoader/include/llapi/mc/LeadItem.hpp index 0421d77f6b..db44e88170 100644 --- a/LiteLoader/include/llapi/mc/LeadItem.hpp +++ b/LiteLoader/include/llapi/mc/LeadItem.hpp @@ -36,11 +36,6 @@ class LeadItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class LeadItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -102,7 +102,17 @@ class LeadItem : public Item { */ virtual void __unk_vfn_80(); /** - * @vftbl 132 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 134 * @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 3c53e3f2c7..54713067ee 100644 --- a/LiteLoader/include/llapi/mc/LeashFenceKnotActor.hpp +++ b/LiteLoader/include/llapi/mc/LeashFenceKnotActor.hpp @@ -47,167 +47,162 @@ class LeashFenceKnotActor : public HangingActor { */ virtual void remove(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 44 + * @vftbl 43 * @symbol ?teleportTo\@LeashFenceKnotActor\@\@UEAAXAEBVVec3\@\@_NHH1\@Z */ virtual void teleportTo(class Vec3 const &, bool, int, int, bool); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 80 + * @vftbl 78 * @symbol ?getShadowRadius\@LeashFenceKnotActor\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_80(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_86(); /** - * @vftbl 95 + * @vftbl 93 * @symbol ?isPickable\@LeashFenceKnotActor\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_94(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_97(); + /** + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 230 + * @vftbl 222 * @symbol ?getInteraction\@LeashFenceKnotActor\@\@UEAA_NAEAVPlayer\@\@AEAVActorInteraction\@\@AEBVVec3\@\@\@Z */ virtual bool getInteraction(class Player &, class ActorInteraction &, class Vec3 const &); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@LeashFenceKnotActor\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@LeashFenceKnotActor\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 274 + * @vftbl 266 * @symbol ?_onSizeUpdated\@LeashFenceKnotActor\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 276 + * @vftbl 268 * @symbol ?setDir\@LeashFenceKnotActor\@\@UEAAXH\@Z */ virtual void setDir(int); /** - * @vftbl 277 + * @vftbl 269 * @symbol ?getWidth\@LeashFenceKnotActor\@\@UEBAHXZ */ virtual int getWidth() const; /** - * @vftbl 278 + * @vftbl 270 * @symbol ?getHeight\@LeashFenceKnotActor\@\@UEBAHXZ */ virtual int getHeight() const; /** - * @vftbl 279 + * @vftbl 271 * @symbol ?dropItem\@LeashFenceKnotActor\@\@UEAAXXZ */ virtual void dropItem(); /** - * @vftbl 281 + * @vftbl 273 * @symbol ?wouldSurvive\@LeashFenceKnotActor\@\@UEAA_NAEAVBlockSource\@\@\@Z */ virtual bool wouldSurvive(class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/LeafBlock.hpp b/LiteLoader/include/llapi/mc/LeavesBlock.hpp similarity index 52% rename from LiteLoader/include/llapi/mc/LeafBlock.hpp rename to LiteLoader/include/llapi/mc/LeavesBlock.hpp index 037f10421c..a0484c8f32 100644 --- a/LiteLoader/include/llapi/mc/LeafBlock.hpp +++ b/LiteLoader/include/llapi/mc/LeavesBlock.hpp @@ -1,5 +1,5 @@ /** - * @file LeafBlock.hpp + * @file LeavesBlock.hpp * */ #pragma once @@ -8,25 +8,20 @@ #include "BlockLegacy.hpp" #define BEFORE_EXTRA -// Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC class LeafBlock. - * - */ -class LeafBlock : public BlockLegacy { + +class LeavesBlock : public BlockLegacy { #define AFTER_EXTRA -// Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LEAFBLOCK +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LEAVESBLOCK public: - class LeafBlock& operator=(class LeafBlock const &) = delete; - LeafBlock(class LeafBlock const &) = delete; - LeafBlock() = delete; + class LeavesBlock& operator=(class LeavesBlock const &) = delete; + LeavesBlock(class LeavesBlock const &) = delete; + LeavesBlock() = delete; #endif public: @@ -42,24 +37,29 @@ class LeafBlock : public BlockLegacy { virtual void __unk_vfn_19(); /** * @vftbl 22 - * @symbol ?canProvideSupport\@LeafBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @symbol ?canProvideSupport\@LeavesBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** * @vftbl 24 - * @symbol ?canProvideMultifaceSupport\@LeafBlock\@\@UEBA_NAEBVBlock\@\@E\@Z + * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -71,10 +71,10 @@ class LeafBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +106,10 @@ class LeafBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,15 +136,15 @@ class LeafBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -152,181 +152,176 @@ class LeafBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 - * @symbol ?canContainLiquid\@LeafBlock\@\@UEBA_NXZ + * @symbol ?canContainLiquid\@LeavesBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@LeafBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 95 + * @symbol ?breaksFallingBlocks\@LeavesBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 102 - * @symbol ?spawnResources\@LeafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @vftbl 101 + * @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 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@LeafBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 105 + * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 137 - * @symbol ?getColor\@LeafBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 135 + * @symbol ?getColor\@LeavesBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 140 - * @symbol ?isSeasonTinted\@LeafBlock\@\@UEBA_NAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 138 + * @symbol ?isSeasonTinted\@LeavesBlock\@\@UEBA_NAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isSeasonTinted(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 141 - * @symbol ?onGraphicsModeChanged\@LeafBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z + * @vftbl 139 + * @symbol ?onGraphicsModeChanged\@LeavesBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 - * @symbol ?onRemove\@LeafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 161 + * @symbol ?onRemove\@LeavesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 173 - * @symbol ?randomTick\@LeafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?randomTick\@LeavesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 182 - * @symbol ?getRenderLayer\@LeafBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 180 + * @symbol ?getRenderLayer\@LeavesBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol ?getMapColor\@LeafBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 185 + * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 - * @symbol ?playerDestroy\@LeafBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 187 + * @symbol ?playerDestroy\@LeavesBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 190 - * @symbol ?getResourceCount\@LeafBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@LeavesBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 195 - * @symbol ?getExtraResourceItem\@LeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 194 + * @symbol ?getExtraResourceItem\@LeavesBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getExtraResourceItem(class Block const &) const; -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_LEAFBLOCK +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_LEAVESBLOCK /** * @symbol __unk_destructor_-1 */ - MCVAPI ~LeafBlock(); + MCVAPI ~LeavesBlock(); #endif /** - * @symbol ??0LeafBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HV?$WeakPtr\@VBlockLegacy\@\@\@\@\@Z + * @symbol ??0LeavesBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HV?$WeakPtr\@VBlockLegacy\@\@\@\@\@Z */ - MCAPI LeafBlock(std::string const &, int, class WeakPtr); + MCAPI LeavesBlock(std::string const &, int, class WeakPtr); /** - * @symbol ?getSeasonsColor\@LeafBlock\@\@QEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z + * @symbol ?getSeasonsColor\@LeavesBlock\@\@QEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z */ MCAPI class mce::Color getSeasonsColor(class BlockSource &, class BlockPos const &, int, int) const; /** - * @symbol ?runDecay\@LeafBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?runDecay\@LeavesBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ MCAPI static void runDecay(class BlockSource &, class BlockPos const &, int); //protected: /** - * @symbol ?_getSapling\@LeafBlock\@\@IEBAAEBVBlock\@\@XZ + * @symbol ?_getSapling\@LeavesBlock\@\@IEBAAEBVBlock\@\@XZ */ MCAPI class Block const & _getSapling() const; diff --git a/LiteLoader/include/llapi/mc/LeafBlockItem.hpp b/LiteLoader/include/llapi/mc/LeavesBlockItem.hpp similarity index 65% rename from LiteLoader/include/llapi/mc/LeafBlockItem.hpp rename to LiteLoader/include/llapi/mc/LeavesBlockItem.hpp index a3eef32a28..3ab7146502 100644 --- a/LiteLoader/include/llapi/mc/LeafBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/LeavesBlockItem.hpp @@ -1,5 +1,5 @@ /** - * @file LeafBlockItem.hpp + * @file LeavesBlockItem.hpp * */ #pragma once @@ -9,25 +9,20 @@ #include "BlockItem.hpp" #define BEFORE_EXTRA -// Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC class LeafBlockItem. - * - */ -class LeafBlockItem : public BlockItem { + +class LeavesBlockItem : public BlockItem { #define AFTER_EXTRA -// Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LEAFBLOCKITEM +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LEAVESBLOCKITEM public: - class LeafBlockItem& operator=(class LeafBlockItem const &) = delete; - LeafBlockItem(class LeafBlockItem const &) = delete; - LeafBlockItem() = delete; + class LeavesBlockItem& operator=(class LeavesBlockItem const &) = delete; + LeavesBlockItem(class LeavesBlockItem const &) = delete; + LeavesBlockItem() = delete; #endif public: @@ -36,11 +31,6 @@ class LeafBlockItem : public BlockItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,9 +46,14 @@ class LeafBlockItem : public BlockItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 45 - * @symbol ?getLevelDataForAuxValue\@LeafBlockItem\@\@UEBAHH\@Z + * @symbol ?getLevelDataForAuxValue\@LeavesBlockItem\@\@UEBAHH\@Z */ virtual int getLevelDataForAuxValue(int) const; /** @@ -108,18 +103,28 @@ class LeafBlockItem : public BlockItem { virtual void __unk_vfn_80(); /** * @vftbl 95 - * @symbol ?buildDescriptionId\@LeafBlockItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @symbol ?buildDescriptionId\@LeavesBlockItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** * @vftbl 105 - * @symbol ?fixupCommon\@LeafBlockItem\@\@UEBAXAEAVItemStackBase\@\@\@Z + * @symbol ?fixupCommon\@LeavesBlockItem\@\@UEBAXAEAVItemStackBase\@\@\@Z */ virtual void fixupCommon(class ItemStackBase &) const; /** * @vftbl 106 - * @symbol ?fixupCommon\@LeafBlockItem\@\@UEBAXAEAVItemStackBase\@\@AEAVLevel\@\@\@Z + * @symbol ?fixupCommon\@LeavesBlockItem\@\@UEBAXAEAVItemStackBase\@\@AEAVLevel\@\@\@Z */ virtual void fixupCommon(class ItemStackBase &, class Level &) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); }; diff --git a/LiteLoader/include/llapi/mc/LecternBlock.hpp b/LiteLoader/include/llapi/mc/LecternBlock.hpp index df9d9d3e07..9616e118b1 100644 --- a/LiteLoader/include/llapi/mc/LecternBlock.hpp +++ b/LiteLoader/include/llapi/mc/LecternBlock.hpp @@ -45,16 +45,21 @@ class LecternBlock : public ActorBlock { * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class LecternBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class LecternBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,20 +136,20 @@ class LecternBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 51 + * @vftbl 50 * @symbol ?isSignalSource\@LecternBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -152,99 +157,99 @@ class LecternBlock : public ActorBlock { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@LecternBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 64 + * @vftbl 63 * @symbol ?shouldConnectToRedstone\@LecternBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 69 + * @vftbl 68 * @symbol ?checkIsPathable\@LecternBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@LecternBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 101 + * @vftbl 100 * @symbol ?playerWillDestroy\@LecternBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 109 + * @vftbl 108 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 125 + * @symbol ?getComparatorSignal\@LecternBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ - virtual void __unk_vfn_126(); + virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** * @vftbl 127 - * @symbol ?getComparatorSignal\@LecternBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z + * @symbol __unk_vfn_127 */ - virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_164(); /** - * @vftbl 162 - * @symbol ?_addHardCodedBlockComponents\@LecternBlock\@\@UEAAXXZ + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void _addHardCodedBlockComponents(); + virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -252,49 +257,39 @@ class LecternBlock : public ActorBlock { 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 ?onPlace\@LecternBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@LecternBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@LecternBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LECTERNBLOCK /** * @symbol ?hasComparatorSignal\@LecternBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/LecternBlockUtil.hpp b/LiteLoader/include/llapi/mc/LecternBlockUtil.hpp new file mode 100644 index 0000000000..4ade4a4855 --- /dev/null +++ b/LiteLoader/include/llapi/mc/LecternBlockUtil.hpp @@ -0,0 +1,28 @@ +/** + * @file LecternBlockUtil.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace LecternBlockUtil { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?LECTERN_AABB_ORIGIN\@LecternBlockUtil\@\@3VVec3\@\@B + */ + MCAPI extern class Vec3 const LECTERN_AABB_ORIGIN; + /** + * @symbol ?LECTERN_AABB_SIZE\@LecternBlockUtil\@\@3VVec3\@\@B + */ + MCAPI extern class Vec3 const LECTERN_AABB_SIZE; + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/LecternUpdatePacket.hpp b/LiteLoader/include/llapi/mc/LecternUpdatePacket.hpp index 59c0a01943..99b1e98d59 100644 --- a/LiteLoader/include/llapi/mc/LecternUpdatePacket.hpp +++ b/LiteLoader/include/llapi/mc/LecternUpdatePacket.hpp @@ -51,9 +51,9 @@ class LecternUpdatePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@LecternUpdatePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@LecternUpdatePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LECTERNUPDATEPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/LegacyActorExtractApplySystem.hpp b/LiteLoader/include/llapi/mc/LegacyActorExtractApplySystem.hpp deleted file mode 100644 index 45acdf2835..0000000000 --- a/LiteLoader/include/llapi/mc/LegacyActorExtractApplySystem.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file LegacyActorExtractApplySystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class LegacyActorExtractApplySystem. - * - */ -class LegacyActorExtractApplySystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LEGACYACTOREXTRACTAPPLYSYSTEM -public: - class LegacyActorExtractApplySystem& operator=(class LegacyActorExtractApplySystem const &) = delete; - LegacyActorExtractApplySystem(class LegacyActorExtractApplySystem const &) = delete; - LegacyActorExtractApplySystem() = delete; -#endif - -public: - /** - * @symbol ?createApplySystem\@LegacyActorExtractApplySystem\@\@SA?AUTickingSystemWithInfo\@\@AEBV?$vector\@IV?$allocator\@I\@std\@\@\@std\@\@_N\@Z - */ - MCAPI static struct TickingSystemWithInfo createApplySystem(std::vector const &, bool); - /** - * @symbol ?createExtractSystem\@LegacyActorExtractApplySystem\@\@SA?AUTickingSystemWithInfo\@\@AEBV?$vector\@IV?$allocator\@I\@std\@\@\@std\@\@_N\@Z - */ - MCAPI static struct TickingSystemWithInfo createExtractSystem(std::vector const &, bool); - -}; diff --git a/LiteLoader/include/llapi/mc/LegacyStructureSettings.hpp b/LiteLoader/include/llapi/mc/LegacyStructureSettings.hpp index afd605e789..8ccc064e6a 100644 --- a/LiteLoader/include/llapi/mc/LegacyStructureSettings.hpp +++ b/LiteLoader/include/llapi/mc/LegacyStructureSettings.hpp @@ -31,14 +31,14 @@ class LegacyStructureSettings { * @symbol ??0LegacyStructureSettings\@\@QEAA\@XZ */ MCAPI LegacyStructureSettings(); - /** - * @symbol ??0LegacyStructureSettings\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI LegacyStructureSettings(class LegacyStructureSettings const &); /** * @symbol ??0LegacyStructureSettings\@\@QEAA\@W4Mirror\@\@W4Rotation\@\@PEBVBlock\@\@AEBVBoundingBox\@\@\@Z */ MCAPI LegacyStructureSettings(enum class Mirror, enum class Rotation, class Block const *, class BoundingBox const &); + /** + * @symbol ??0LegacyStructureSettings\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI LegacyStructureSettings(class LegacyStructureSettings const &); /** * @symbol ?addSwapAuxValue\@LegacyStructureSettings\@\@QEAAXHH\@Z */ diff --git a/LiteLoader/include/llapi/mc/LessonProgressPacket.hpp b/LiteLoader/include/llapi/mc/LessonProgressPacket.hpp index 0a0ab2bdae..7f384dbb6d 100644 --- a/LiteLoader/include/llapi/mc/LessonProgressPacket.hpp +++ b/LiteLoader/include/llapi/mc/LessonProgressPacket.hpp @@ -49,9 +49,9 @@ class LessonProgressPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@LessonProgressPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@LessonProgressPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 392487b3e0..7485c4bd2c 100644 --- a/LiteLoader/include/llapi/mc/Level.hpp +++ b/LiteLoader/include/llapi/mc/Level.hpp @@ -294,6 +294,10 @@ class Level { * @symbol ?_destroyEffect\@Level\@\@UEAAXAEBVBlockPos\@\@AEBVBlock\@\@H\@Z */ MCVAPI void _destroyEffect(class BlockPos const &, class Block const &, int); + /** + * @symbol ?_getPlayerDeathManager\@Level\@\@MEAAPEAVPlayerDeathManager\@\@XZ + */ + MCVAPI class PlayerDeathManager * _getPlayerDeathManager(); /** * @symbol ?_localPlayerChangedDimension\@Level\@\@MEAAXXZ */ @@ -411,13 +415,9 @@ class Level { */ MCVAPI void broadcastSoundEvent(class Dimension &, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); /** - * @symbol ?canUseSkin\@Level\@\@UEBA_NAEBVSerializedSkin\@\@AEBVNetworkIdentifier\@\@AEBVUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCVAPI bool canUseSkin(class SerializedSkin const &, class NetworkIdentifier const &, class mce::UUID const &, std::string const &) const; - /** - * @symbol ?consolidateLevelChunkMetaData\@Level\@\@UEAAXAEAVLevelChunk\@\@\@Z + * @symbol ?canUseSkin\@Level\@\@UEBA_NAEBVSerializedSkin\@\@AEBVNetworkIdentifier\@\@AEBVUUID\@mce\@\@AEBUActorUniqueID\@\@\@Z */ - MCVAPI void consolidateLevelChunkMetaData(class LevelChunk &); + MCVAPI bool canUseSkin(class SerializedSkin const &, class NetworkIdentifier const &, class mce::UUID const &, struct ActorUniqueID const &) const; /** * @symbol ?copyAndLockMap\@Level\@\@UEAA_NUActorUniqueID\@\@0\@Z */ @@ -486,14 +486,14 @@ class Level { * @symbol ?fetchEntity\@Level\@\@UEBAPEAVActor\@\@UActorUniqueID\@\@_N\@Z */ MCVAPI class Actor * fetchEntity(struct ActorUniqueID, bool) const; - /** - * @symbol ?findPath\@Level\@\@UEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVActor\@\@0AEAVNavigationComponent\@\@\@Z - */ - MCVAPI std::unique_ptr findPath(class Actor &, class Actor &, class NavigationComponent &); /** * @symbol ?findPath\@Level\@\@UEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVActor\@\@HHHAEAVNavigationComponent\@\@\@Z */ MCVAPI std::unique_ptr findPath(class Actor &, int, int, int, class NavigationComponent &); + /** + * @symbol ?findPath\@Level\@\@UEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVActor\@\@0AEAVNavigationComponent\@\@\@Z + */ + MCVAPI std::unique_ptr findPath(class Actor &, class Actor &, class NavigationComponent &); /** * @symbol ?findPlayer\@Level\@\@UEBAPEAVPlayer\@\@V?$function\@$$A6A_NAEBVPlayer\@\@\@Z\@std\@\@\@Z */ @@ -506,14 +506,14 @@ class Level { * @symbol ?flushRunTimeLighting\@Level\@\@UEAAXXZ */ MCVAPI void flushRunTimeLighting(); - /** - * @symbol ?forEachDimension\@Level\@\@UEAAXV?$function\@$$A6A_NAEAVDimension\@\@\@Z\@std\@\@\@Z - */ - MCVAPI void forEachDimension(class std::function); /** * @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 */ @@ -522,14 +522,14 @@ class Level { * @symbol ?forEachPlayer\@Level\@\@UEBAXV?$function\@$$A6A_NAEBVPlayer\@\@\@Z\@std\@\@\@Z */ MCVAPI void forEachPlayer(class std::function) const; - /** - * @symbol ?forEachUser\@Level\@\@UEBAXV?$function\@$$A6A_NAEBVEntityContext\@\@\@Z\@std\@\@\@Z - */ - MCVAPI void forEachUser(class std::function) const; /** * @symbol ?forEachUser\@Level\@\@UEAAXV?$function\@$$A6A_NAEAVEntityContext\@\@\@Z\@std\@\@\@Z */ MCVAPI void forEachUser(class std::function); + /** + * @symbol ?forEachUser\@Level\@\@UEBAXV?$function\@$$A6A_NAEBVEntityContext\@\@\@Z\@std\@\@\@Z + */ + MCVAPI void forEachUser(class std::function) const; /** * @symbol ?forceFlushRemovedPlayers\@Level\@\@UEAAXXZ */ @@ -566,14 +566,14 @@ class Level { * @symbol ?getActorEventCoordinator\@Level\@\@UEAAAEAVActorEventCoordinator\@\@XZ */ MCVAPI class ActorEventCoordinator & getActorEventCoordinator(); - /** - * @symbol ?getActorFactory\@Level\@\@UEBAAEBVActorFactory\@\@XZ - */ - MCVAPI class ActorFactory const & getActorFactory() const; /** * @symbol ?getActorFactory\@Level\@\@UEAAAEAVActorFactory\@\@XZ */ MCVAPI class ActorFactory & getActorFactory(); + /** + * @symbol ?getActorFactory\@Level\@\@UEBAAEBVActorFactory\@\@XZ + */ + MCVAPI class ActorFactory const & getActorFactory() const; /** * @symbol ?getActorInfoRegistry\@Level\@\@UEAAPEAVActorInfoRegistry\@\@XZ */ @@ -582,6 +582,10 @@ class Level { * @symbol ?getActorPropertyGroup\@Level\@\@UEBAAEAVPropertyGroupManager\@\@XZ */ MCVAPI class PropertyGroupManager & getActorPropertyGroup() const; + /** + * @symbol ?getAdventureSettings\@Level\@\@UEBAAEBUAdventureSettings\@\@XZ + */ + MCVAPI struct AdventureSettings const & getAdventureSettings() const; /** * @symbol ?getAdventureSettings\@Level\@\@UEAAAEAUAdventureSettings\@\@XZ */ @@ -614,14 +618,14 @@ class Level { * @symbol ?getBiomeRegistry\@Level\@\@UEBAAEBVBiomeRegistry\@\@XZ */ MCVAPI class BiomeRegistry const & getBiomeRegistry() const; - /** - * @symbol ?getBlockComponentFactory\@Level\@\@UEBAAEBVBlockComponentFactory\@\@XZ - */ - MCVAPI class BlockComponentFactory const & getBlockComponentFactory() const; /** * @symbol ?getBlockComponentFactory\@Level\@\@UEAAAEAVBlockComponentFactory\@\@XZ */ MCVAPI class BlockComponentFactory & getBlockComponentFactory(); + /** + * @symbol ?getBlockComponentFactory\@Level\@\@UEBAAEBVBlockComponentFactory\@\@XZ + */ + MCVAPI class BlockComponentFactory const & getBlockComponentFactory() const; /** * @symbol ?getBlockDefinitions\@Level\@\@UEBAPEAVBlockDefinitionGroup\@\@XZ */ @@ -630,14 +634,14 @@ class Level { * @symbol ?getBlockEventCoordinator\@Level\@\@UEAAAEAVBlockEventCoordinator\@\@XZ */ MCVAPI class BlockEventCoordinator & getBlockEventCoordinator(); - /** - * @symbol ?getBlockPalette\@Level\@\@UEAAAEAVBlockPalette\@\@XZ - */ - MCVAPI class BlockPalette & getBlockPalette(); /** * @symbol ?getBlockPalette\@Level\@\@UEBAAEBVBlockPalette\@\@XZ */ MCVAPI class BlockPalette const & getBlockPalette() const; + /** + * @symbol ?getBlockPalette\@Level\@\@UEAAAEAVBlockPalette\@\@XZ + */ + MCVAPI class BlockPalette & getBlockPalette(); /** * @symbol ?getBlockReducer\@Level\@\@UEBAPEAVBlockReducer\@\@XZ */ @@ -650,14 +654,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\@\@UEAAAEAVCameraPresets\@\@XZ - */ - MCVAPI class CameraPresets & getCameraPresets(); /** * @symbol ?getCameraPresets\@Level\@\@UEBAAEBVCameraPresets\@\@XZ */ MCVAPI class CameraPresets const & getCameraPresets() const; + /** + * @symbol ?getCameraPresets\@Level\@\@UEAAAEAVCameraPresets\@\@XZ + */ + MCVAPI class CameraPresets & getCameraPresets(); /** * @symbol ?getCapabilities\@Level\@\@UEBAAEBUISharedController\@PlayerCapabilities\@\@XZ */ @@ -698,14 +702,14 @@ class Level { * @symbol ?getDefaultGameType\@Level\@\@UEBA?AW4GameType\@\@XZ */ MCVAPI enum class GameType getDefaultGameType() const; - /** - * @symbol ?getDefaultPermissions\@Level\@\@UEAAAEAVPermissionsHandler\@\@XZ - */ - MCVAPI class PermissionsHandler & getDefaultPermissions(); /** * @symbol ?getDefaultPermissions\@Level\@\@UEBAAEBVPermissionsHandler\@\@XZ */ MCVAPI class PermissionsHandler const & getDefaultPermissions() const; + /** + * @symbol ?getDefaultPermissions\@Level\@\@UEAAAEAVPermissionsHandler\@\@XZ + */ + MCVAPI class PermissionsHandler & getDefaultPermissions(); /** * @symbol ?getDefaultSpawn\@Level\@\@UEBAAEBVBlockPos\@\@XZ */ @@ -730,14 +734,14 @@ class Level { * @symbol ?getDimensionFactory\@Level\@\@UEBAAEBV?$OwnerPtrFactory\@VDimension\@\@AEAVILevel\@\@AEAVScheduler\@\@\@\@XZ */ MCVAPI class OwnerPtrFactory const & getDimensionFactory() const; - /** - * @symbol ?getDimensionManager\@Level\@\@UEBAAEBVDimensionManager\@\@XZ - */ - MCVAPI class DimensionManager const & getDimensionManager() const; /** * @symbol ?getDimensionManager\@Level\@\@UEAAAEAVDimensionManager\@\@XZ */ MCVAPI class DimensionManager & getDimensionManager(); + /** + * @symbol ?getDimensionManager\@Level\@\@UEBAAEBVDimensionManager\@\@XZ + */ + MCVAPI class DimensionManager const & getDimensionManager() const; /** * @symbol ?getDisablePlayerInteractions\@Level\@\@UEBA_NXZ */ @@ -770,30 +774,30 @@ class Level { * @symbol ?getEventing\@Level\@\@UEAAAEAVIMinecraftEventing\@\@XZ */ MCVAPI class IMinecraftEventing & getEventing(); - /** - * @symbol ?getFeatureRegistry\@Level\@\@UEBAAEBVFeatureRegistry\@\@XZ - */ - MCVAPI class FeatureRegistry const & getFeatureRegistry() const; /** * @symbol ?getFeatureRegistry\@Level\@\@UEAAAEAVFeatureRegistry\@\@XZ */ MCVAPI class FeatureRegistry & getFeatureRegistry(); /** - * @symbol ?getFeatureTypeFactory\@Level\@\@UEBAAEBVFeatureTypeFactory\@\@XZ + * @symbol ?getFeatureRegistry\@Level\@\@UEBAAEBVFeatureRegistry\@\@XZ */ - MCVAPI class FeatureTypeFactory const & getFeatureTypeFactory() const; + MCVAPI class FeatureRegistry const & getFeatureRegistry() const; /** * @symbol ?getFeatureTypeFactory\@Level\@\@UEAAAEAVFeatureTypeFactory\@\@XZ */ MCVAPI class FeatureTypeFactory & getFeatureTypeFactory(); /** - * @symbol ?getGameRules\@Level\@\@UEBAAEBVGameRules\@\@XZ + * @symbol ?getFeatureTypeFactory\@Level\@\@UEBAAEBVFeatureTypeFactory\@\@XZ */ - MCVAPI class GameRules const & getGameRules() const; + 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 ?getHitResult\@Level\@\@UEAAAEAVHitResult\@\@XZ */ @@ -839,9 +843,9 @@ class Level { */ MCVAPI class AutomaticID getLastOrDefaultSpawnDimensionId(class AutomaticID) const; /** - * @symbol ?getLevelChunkMetaDataDictionary\@Level\@\@UEBA?AV?$shared_ptr\@VLevelChunkMetaDataDictionary\@\@\@std\@\@XZ + * @symbol ?getLevelChunkMetaDataManager\@Level\@\@UEAAPEAVLevelChunkMetaDataManager\@\@XZ */ - MCVAPI class std::shared_ptr getLevelChunkMetaDataDictionary() const; + MCVAPI class LevelChunkMetaDataManager * getLevelChunkMetaDataManager(); /** * @symbol ?getLevelData\@Level\@\@UEAAAEAVLevelData\@\@XZ */ @@ -862,14 +866,14 @@ class Level { * @symbol ?getLevelId\@Level\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getLevelId() const; - /** - * @symbol ?getLevelStorage\@Level\@\@UEBAAEBVLevelStorage\@\@XZ - */ - MCVAPI class LevelStorage const & getLevelStorage() const; /** * @symbol ?getLevelStorage\@Level\@\@UEAAAEAVLevelStorage\@\@XZ */ MCVAPI class LevelStorage & getLevelStorage(); + /** + * @symbol ?getLevelStorage\@Level\@\@UEBAAEBVLevelStorage\@\@XZ + */ + MCVAPI class LevelStorage const & getLevelStorage() const; /** * @symbol ?getLightTextureImageBuilderFactory\@Level\@\@UEAAAEAV?$Factory\@VBaseLightTextureImageBuilder\@\@AEAVLevel\@\@AEAVScheduler\@\@\@\@XZ */ @@ -886,6 +890,10 @@ 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 */ @@ -894,10 +902,6 @@ 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 */ @@ -914,10 +918,6 @@ class Level { * @symbol ?getNetherScale\@Level\@\@UEBAHXZ */ MCVAPI int getNetherScale() const; - /** - * @symbol ?getNewPlayerId\@Level\@\@UEBAHXZ - */ - MCVAPI int getNewPlayerId() const; /** * @symbol ?getNewUniqueID\@Level\@\@UEAA?AUActorUniqueID\@\@XZ */ @@ -963,17 +963,17 @@ class Level { */ MCVAPI class Player * getPlatformPlayer(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 ?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\@\@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 ?getPlayerAbilities\@Level\@\@UEAAPEAVLayeredAbilities\@\@AEBUActorUniqueID\@\@\@Z */ @@ -1002,10 +1002,6 @@ class Level { * @symbol ?getPlayerMovementSettings\@Level\@\@UEBAAEBUPlayerMovementSettings\@\@XZ */ MCVAPI struct PlayerMovementSettings const & getPlayerMovementSettings() const; - /** - * @symbol ?getPlayerNames\@Level\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCVAPI std::string getPlayerNames(); /** * @symbol ?getPlayerPlatformOnlineId\@Level\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVUUID\@mce\@\@\@Z */ @@ -1038,10 +1034,6 @@ class Level { * @symbol ?getRandom\@Level\@\@UEBAAEAVRandom\@\@XZ */ MCVAPI class Random & getRandom() const; - /** - * @symbol ?getRandomPlayer\@Level\@\@UEAAPEAVPlayer\@\@XZ - */ - MCVAPI class Player * getRandomPlayer(); /** * @symbol ?getRecipes\@Level\@\@UEBAAEAVRecipes\@\@XZ */ @@ -1067,13 +1059,17 @@ class Level { */ MCVAPI class Player * getRuntimePlayer(class ActorRuntimeID) const; /** - * @symbol ?getSavedData\@Level\@\@UEBAAEAVSavedDataStorage\@\@XZ + * @symbol ?getSavedData\@Level\@\@UEAAAEAVSavedDataStorage\@\@XZ */ - MCVAPI class SavedDataStorage & getSavedData() const; + MCVAPI class SavedDataStorage & getSavedData(); /** * @symbol ?getScoreboard\@Level\@\@UEAAAEAVScoreboard\@\@XZ */ MCVAPI class Scoreboard & getScoreboard(); + /** + * @symbol ?getScoreboard\@Level\@\@UEBAAEBVScoreboard\@\@XZ + */ + MCVAPI class Scoreboard const & getScoreboard() const; /** * @symbol ?getScreenshotsFolder\@Level\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ @@ -1186,22 +1182,22 @@ class Level { * @symbol ?getTradeTables\@Level\@\@UEAAPEAVTradeTables\@\@XZ */ MCVAPI class TradeTables * getTradeTables(); - /** - * @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\@\@UEAA?AV?$weak_ptr\@VTrimPatternRegistry\@\@\@std\@\@XZ + * @symbol ?getTrimMaterialRegistry\@Level\@\@UEBA?AV?$weak_ptr\@$$CBVTrimMaterialRegistry\@\@\@std\@\@XZ */ - MCVAPI class std::weak_ptr getTrimPatternRegistry(); + MCVAPI class std::weak_ptr getTrimMaterialRegistry() const; /** * @symbol ?getTrimPatternRegistry\@Level\@\@UEBA?AV?$weak_ptr\@$$CBVTrimPatternRegistry\@\@\@std\@\@XZ */ MCVAPI class std::weak_ptr getTrimPatternRegistry() const; + /** + * @symbol ?getTrimPatternRegistry\@Level\@\@UEAA?AV?$weak_ptr\@VTrimPatternRegistry\@\@\@std\@\@XZ + */ + MCVAPI class std::weak_ptr getTrimPatternRegistry(); /** * @symbol ?getUnknownBlockTypeRegistry\@Level\@\@UEAA?AV?$NonOwnerPointer\@VIUnknownBlockTypeRegistry\@\@\@Bedrock\@\@XZ */ @@ -1210,22 +1206,18 @@ class Level { * @symbol ?getUserCount\@Level\@\@UEBAHXZ */ MCVAPI int getUserCount() const; - /** - * @symbol ?getUsers\@Level\@\@UEAAAEAV?$vector\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@V?$allocator\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@std\@\@\@std\@\@XZ - */ - MCVAPI std::vector> & getUsers(); /** * @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\@\@UEAAAEAVIWorldRegistriesProvider\@\@XZ - */ - MCVAPI class IWorldRegistriesProvider & getWorldRegistriesProvider(); /** * @symbol ?getWorldRegistriesProvider\@Level\@\@UEBAAEBVIWorldRegistriesProvider\@\@XZ */ MCVAPI class IWorldRegistriesProvider const & getWorldRegistriesProvider() const; + /** + * @symbol ?getWorldRegistriesProvider\@Level\@\@UEAAAEAVIWorldRegistriesProvider\@\@XZ + */ + MCVAPI class IWorldRegistriesProvider & getWorldRegistriesProvider(); /** * @symbol ?getXBLBroadcastIntent\@Level\@\@UEBA?AW4GamePublishSetting\@Social\@\@XZ */ @@ -1234,22 +1226,14 @@ class Level { * @symbol ?getXBLBroadcastMode\@Level\@\@UEBA?AW4GamePublishSetting\@Social\@\@XZ */ MCVAPI enum class Social::GamePublishSetting getXBLBroadcastMode() const; - /** - * @symbol ?handleLevelEvent\@Level\@\@UEAAXW4LevelEvent\@\@AEBVVec3\@\@H\@Z - */ - MCVAPI void handleLevelEvent(enum class LevelEvent, class Vec3 const &, int); /** * @symbol ?handleLevelEvent\@Level\@\@UEAAXW4LevelEvent\@\@AEBVCompoundTag\@\@\@Z */ MCVAPI void handleLevelEvent(enum class LevelEvent, class CompoundTag const &); /** - * @symbol ?handleSoundEvent\@Level\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVec3\@\@MM\@Z - */ - MCVAPI void handleSoundEvent(std::string const &, class Vec3 const &, float, float); - /** - * @symbol ?handleSoundEvent\@Level\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z + * @symbol ?handleLevelEvent\@Level\@\@UEAAXW4LevelEvent\@\@AEBVVec3\@\@H\@Z */ - MCVAPI void handleSoundEvent(enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); + MCVAPI void handleLevelEvent(enum class LevelEvent, class Vec3 const &, int); /** * @symbol ?handleStopAllSounds\@Level\@\@UEAAXXZ */ @@ -1302,10 +1286,6 @@ class Level { * @symbol ?initializeBlockDefinitionGroup\@Level\@\@UEAAXXZ */ MCVAPI void initializeBlockDefinitionGroup(); - /** - * @symbol ?initializeLevelChunkMetaData\@Level\@\@UEAAXAEAVLevelChunk\@\@\@Z - */ - MCVAPI void initializeLevelChunkMetaData(class LevelChunk &); /** * @symbol ?isClientSide\@Level\@\@UEBA_NXZ */ @@ -1390,10 +1370,6 @@ class Level { * @symbol ?pauseAndFlushTaskGroups\@Level\@\@UEAAXXZ */ MCVAPI void pauseAndFlushTaskGroups(); - /** - * @symbol ?playSound\@Level\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z - */ - MCVAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); /** * @symbol ?playSound\@Level\@\@UEAAXV?$AutomaticID\@VDimension\@\@H\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z */ @@ -1407,13 +1383,21 @@ class Level { */ MCVAPI void playSound(class IConstBlockSource const &, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); /** - * @symbol ?playSynchronizedSound\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z + * @symbol ?playSound\@Level\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVec3\@\@MM\@Z */ - MCVAPI void playSynchronizedSound(class BlockSource &, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); + MCVAPI void playSound(std::string const &, 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 */ MCVAPI void playSynchronizedSound(class IDimension &, enum class LevelSoundEvent, class Vec3 const &, int, 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 */ @@ -1422,10 +1406,6 @@ class Level { * @symbol ?potionSplash\@Level\@\@UEAAXAEBVVec3\@\@AEBVColor\@mce\@\@_N\@Z */ MCVAPI void potionSplash(class Vec3 const &, class mce::Color const &, bool); - /** - * @symbol ?pruneChunkViewTrackers\@Level\@\@UEAAXXZ - */ - MCVAPI void pruneChunkViewTrackers(); /** * @symbol ?queueEntityDestruction\@Level\@\@UEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z */ @@ -1454,14 +1434,14 @@ class Level { * @symbol ?removeDisplayEntity\@Level\@\@UEAAXVWeakEntityRef\@\@\@Z */ MCVAPI void removeDisplayEntity(class WeakEntityRef); - /** - * @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 ?removeEntity\@Level\@\@UEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@VWeakEntityRef\@\@\@Z + */ + MCVAPI class OwnerPtrT removeEntity(class WeakEntityRef); /** * @symbol ?removeListener\@Level\@\@UEAAXAEAVLevelListener\@\@\@Z */ @@ -1506,10 +1486,6 @@ class Level { * @symbol ?saveDirtyChunks\@Level\@\@UEAAXXZ */ MCVAPI void saveDirtyChunks(); - /** - * @symbol ?saveDynamicProperties\@Level\@\@UEAAXXZ - */ - MCVAPI void saveDynamicProperties(); /** * @symbol ?saveEducationLevelSettings\@Level\@\@UEAAXXZ */ @@ -1526,10 +1502,6 @@ class Level { * @symbol ?savePlayer\@Level\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void savePlayer(class Player &); - /** - * @symbol ?savePlayers\@Level\@\@UEAAXXZ - */ - MCVAPI void savePlayers(); /** * @symbol ?saveVillages\@Level\@\@UEAAXXZ */ @@ -1764,21 +1736,21 @@ class Level { 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\@44V?$optional\@VDimensionDefinitionGroup\@\@\@4\@\@Z + * @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 */ - 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, class std::optional); + 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); /** * @symbol ?canChangeDimension\@Level\@\@QEAA_NAEAVActor\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI bool canChangeDimension(class Actor &, class AutomaticID); /** - * @symbol ?getActorManager\@Level\@\@QEAAAEAVActorManager\@\@XZ + * @symbol ?earlyShutdownMainthread\@Level\@\@QEAAXXZ */ - MCAPI class ActorManager & getActorManager(); + MCAPI void earlyShutdownMainthread(); /** - * @symbol ?getAdventureSettings\@Level\@\@QEBAAEBUAdventureSettings\@\@XZ + * @symbol ?getActorManager\@Level\@\@QEAAAEAVActorManager\@\@XZ */ - MCAPI struct AdventureSettings const & getAdventureSettings() const; + MCAPI class ActorManager & getActorManager(); /** * @symbol ?getAutonomousActorManager\@Level\@\@QEBAAEBVAutonomousActorManager\@\@XZ */ @@ -1869,16 +1841,20 @@ class Level { * @symbol ?_getGameplayUserManager\@Level\@\@IEAAAEAVGameplayUserManager\@\@XZ */ MCAPI class GameplayUserManager & _getGameplayUserManager(); + /** + * @symbol ?_getLevelStorageManager\@Level\@\@IEAAAEAVLevelStorageManager\@\@XZ + */ + MCAPI class LevelStorageManager & _getLevelStorageManager(); + /** + * @symbol ?_getPlayerListManager\@Level\@\@IEAAAEAVPlayerListManager\@\@XZ + */ + MCAPI class PlayerListManager & _getPlayerListManager(); //private: /** * @symbol ?_checkBlockSourceValidity\@Level\@\@AEAAXXZ */ MCAPI void _checkBlockSourceValidity(); - /** - * @symbol ?_cleanupDisconnectedPlayers\@Level\@\@AEAAXXZ - */ - MCAPI void _cleanupDisconnectedPlayers(); /** * @symbol ?_clearOwnedEntityLimboForPlayer\@Level\@\@AEAAXAEBVPlayer\@\@\@Z */ @@ -1899,6 +1875,10 @@ class Level { * @symbol ?_initializeActorManager\@Level\@\@AEAAXXZ */ MCAPI void _initializeActorManager(); + /** + * @symbol ?_initializeGameplayUserManager\@Level\@\@AEAAXXZ + */ + MCAPI void _initializeGameplayUserManager(); /** * @symbol ?_loadAutonomousEntities\@Level\@\@AEAAXXZ */ @@ -1915,14 +1895,26 @@ class Level { * @symbol ?_loadOwnedEntityLimbo\@Level\@\@AEAAXXZ */ MCAPI void _loadOwnedEntityLimbo(); + /** + * @symbol ?_onAnyGameplayUsersRemoved\@Level\@\@AEAAXXZ + */ + MCAPI void _onAnyGameplayUsersRemoved(); /** * @symbol ?_onGameplayUserAdded\@Level\@\@AEAAXAEAVEntityContext\@\@\@Z */ MCAPI void _onGameplayUserAdded(class EntityContext &); + /** + * @symbol ?_onGameplayUserRemoved\@Level\@\@AEAAXAEAVEntityContext\@\@\@Z + */ + MCAPI void _onGameplayUserRemoved(class EntityContext &); /** * @symbol ?_onRemoveActorEntityReferences\@Level\@\@AEAAXAEAVActor\@\@\@Z */ MCAPI void _onRemoveActorEntityReferences(class Actor &); + /** + * @symbol ?_onSaveLevelData\@Level\@\@AEAAXAEAVLevelStorage\@\@\@Z + */ + MCAPI void _onSaveLevelData(class LevelStorage &); /** * @symbol ?_playerChangeDimension\@Level\@\@AEAA_NAEAVPlayer\@\@AEAVChangeDimensionRequest\@\@\@Z */ @@ -1939,14 +1931,6 @@ class Level { * @symbol ?_playerChangeDimensionWaitingForRespawn\@Level\@\@AEAA_NAEAVPlayer\@\@AEAVChangeDimensionRequest\@\@\@Z */ MCAPI bool _playerChangeDimensionWaitingForRespawn(class Player &, class ChangeDimensionRequest &); - /** - * @symbol ?_processPlayerNetworking\@Level\@\@AEAAXXZ - */ - MCAPI void _processPlayerNetworking(); - /** - * @symbol ?_saveAutonomousEntities\@Level\@\@AEAAXXZ - */ - MCAPI void _saveAutonomousEntities(); /** * @symbol ?_saveOwnedEntityLimboForPlayer\@Level\@\@AEAAXAEBVPlayer\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LevelChunk.hpp b/LiteLoader/include/llapi/mc/LevelChunk.hpp index e3a1bf25db..6b31ccaca2 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\@\@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 ?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 ?getEntity\@LevelChunk\@\@QEBAPEAVActor\@\@AEBUActorUniqueID\@\@\@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\@\@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); + /** + * @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 &); protected: /** diff --git a/LiteLoader/include/llapi/mc/LevelChunkMetaDataInitializer.hpp b/LiteLoader/include/llapi/mc/LevelChunkMetaDataInitializer.hpp deleted file mode 100644 index 1b3e0fa8f7..0000000000 --- a/LiteLoader/include/llapi/mc/LevelChunkMetaDataInitializer.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file LevelChunkMetaDataInitializer.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC namespace LevelChunkMetaDataInitializer. - * - */ -namespace LevelChunkMetaDataInitializer { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA - /** - * @symbol ?inferInitialMetaDataAfterDeserialization\@LevelChunkMetaDataInitializer\@\@YAXAEAVLevelChunk\@\@AEAVLevelChunkMetaData\@\@\@Z - */ - MCAPI void inferInitialMetaDataAfterDeserialization(class LevelChunk &, class LevelChunkMetaData &); - /** - * @symbol ?inferTargetMetaData\@LevelChunkMetaDataInitializer\@\@YAXAEBVBaseGameVersion\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEAVLevelChunkMetaData\@\@\@Z - */ - MCAPI void inferTargetMetaData(class BaseGameVersion const &, class AutomaticID, class LevelChunkMetaData &); - /** - * @symbol ?setupInitialMetaData\@LevelChunkMetaDataInitializer\@\@YAXAEAVLevelChunk\@\@AEAVLevelChunkMetaData\@\@\@Z - */ - MCAPI void setupInitialMetaData(class LevelChunk &, class LevelChunkMetaData &); - /** - * @symbol ?updateLevelChunkMetaDataForSaving\@LevelChunkMetaDataInitializer\@\@YAXAEAVLevelChunk\@\@\@Z - */ - MCAPI void updateLevelChunkMetaDataForSaving(class LevelChunk &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/LevelChunkMetaDataManager.hpp b/LiteLoader/include/llapi/mc/LevelChunkMetaDataManager.hpp new file mode 100644 index 0000000000..c8455d83f4 --- /dev/null +++ b/LiteLoader/include/llapi/mc/LevelChunkMetaDataManager.hpp @@ -0,0 +1,72 @@ +/** + * @file LevelChunkMetaDataManager.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class LevelChunkMetaDataManager { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LEVELCHUNKMETADATAMANAGER +public: + class LevelChunkMetaDataManager& operator=(class LevelChunkMetaDataManager const &) = delete; + LevelChunkMetaDataManager(class LevelChunkMetaDataManager const &) = delete; + LevelChunkMetaDataManager() = delete; +#endif + +public: + /** + * @symbol ?consolidateLevelChunkMetaData\@LevelChunkMetaDataManager\@\@QEAAXAEAVLevelChunk\@\@\@Z + */ + MCAPI void consolidateLevelChunkMetaData(class LevelChunk &); + /** + * @symbol ?getLevelChunkMetaDataDictionary\@LevelChunkMetaDataManager\@\@QEBA?AV?$shared_ptr\@VLevelChunkMetaDataDictionary\@\@\@std\@\@XZ + */ + MCAPI class std::shared_ptr getLevelChunkMetaDataDictionary() const; + /** + * @symbol ?registerOnNewDimensionCreated\@LevelChunkMetaDataManager\@\@QEAAXAEAVDimensionManager\@\@\@Z + */ + MCAPI void registerOnNewDimensionCreated(class DimensionManager &); + /** + * @symbol ?tick\@LevelChunkMetaDataManager\@\@QEAAXXZ + */ + MCAPI void tick(); + /** + * @symbol ?updateLevelChunkMetaDataForSaving\@LevelChunkMetaDataManager\@\@QEAAXAEAVLevelChunk\@\@AEBVBaseGameVersion\@\@AEBVDimensionHeightRange\@\@\@Z + */ + MCAPI void updateLevelChunkMetaDataForSaving(class LevelChunk &, class BaseGameVersion const &, class DimensionHeightRange const &); + /** + * @symbol ??1LevelChunkMetaDataManager\@\@QEAA\@XZ + */ + MCAPI ~LevelChunkMetaDataManager(); + /** + * @symbol ?inferInitialMetaDataAfterDeserialization\@LevelChunkMetaDataManager\@\@SAXAEAVLevelChunk\@\@VLevelSeed64\@\@W4GeneratorType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBVDimensionHeightRange\@\@AEBVBaseGameVersion\@\@AEAVLevelChunkMetaData\@\@\@Z + */ + MCAPI static void inferInitialMetaDataAfterDeserialization(class LevelChunk &, class LevelSeed64, enum class GeneratorType, std::string const &, class AutomaticID, class DimensionHeightRange const &, class BaseGameVersion const &, class LevelChunkMetaData &); + /** + * @symbol ?inferTargetMetaData\@LevelChunkMetaDataManager\@\@SAXAEBVBaseGameVersion\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEAVLevelChunkMetaData\@\@\@Z + */ + MCAPI static void inferTargetMetaData(class BaseGameVersion const &, class AutomaticID, class LevelChunkMetaData &); + /** + * @symbol ?initializeLevelChunkMetaData\@LevelChunkMetaDataManager\@\@SA?AV?$shared_ptr\@VLevelChunkMetaData\@\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVDimensionHeightRange\@\@_NVLevelSeed64\@\@W4GeneratorType\@\@AEBVBaseGameVersion\@\@\@Z + */ + MCAPI static class std::shared_ptr initializeLevelChunkMetaData(class AutomaticID, std::string const &, class DimensionHeightRange const &, bool, class LevelSeed64, enum class GeneratorType, class BaseGameVersion const &); + +//private: + /** + * @symbol ?_onNewDimensionCreated\@LevelChunkMetaDataManager\@\@AEAAXAEAVDimension\@\@\@Z + */ + MCAPI void _onNewDimensionCreated(class Dimension &); + +private: + +}; diff --git a/LiteLoader/include/llapi/mc/LevelChunkPacket.hpp b/LiteLoader/include/llapi/mc/LevelChunkPacket.hpp index cdf5091226..58fafbecdd 100644 --- a/LiteLoader/include/llapi/mc/LevelChunkPacket.hpp +++ b/LiteLoader/include/llapi/mc/LevelChunkPacket.hpp @@ -51,9 +51,9 @@ class LevelChunkPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@LevelChunkPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@LevelChunkPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0LevelChunkPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/LevelContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/LevelContainerManagerModel.hpp index fac9161b3d..f8bba1f145 100644 --- a/LiteLoader/include/llapi/mc/LevelContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/LevelContainerManagerModel.hpp @@ -76,14 +76,14 @@ class LevelContainerManagerModel : public ContainerManagerModel { */ MCVAPI ~LevelContainerManagerModel(); #endif - /** - * @symbol ??0LevelContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@W4BlockActorType\@\@\@Z - */ - MCAPI LevelContainerManagerModel(enum class ContainerID, class Player &, class BlockPos const &, enum class BlockActorType); /** * @symbol ??0LevelContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@UActorUniqueID\@\@\@Z */ MCAPI LevelContainerManagerModel(enum class ContainerID, class Player &, struct ActorUniqueID); + /** + * @symbol ??0LevelContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@W4BlockActorType\@\@\@Z + */ + MCAPI LevelContainerManagerModel(enum class ContainerID, class Player &, class BlockPos const &, enum class BlockActorType); /** * @symbol ?getBlockPos\@LevelContainerManagerModel\@\@QEBAAEBVBlockPos\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/LevelData.hpp b/LiteLoader/include/llapi/mc/LevelData.hpp index d2fd841408..47519b3b97 100644 --- a/LiteLoader/include/llapi/mc/LevelData.hpp +++ b/LiteLoader/include/llapi/mc/LevelData.hpp @@ -32,14 +32,14 @@ class LevelData { #endif public: - /** - * @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\@$$QEAV0\@\@Z */ MCAPI LevelData(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 */ @@ -152,14 +152,14 @@ class LevelData { * @symbol ?getGameDifficulty\@LevelData\@\@QEBA?AW4Difficulty\@\@XZ */ MCAPI enum class Difficulty getGameDifficulty() const; - /** - * @symbol ?getGameRules\@LevelData\@\@QEAAAEAVGameRules\@\@XZ - */ - MCAPI class GameRules & getGameRules(); /** * @symbol ?getGameRules\@LevelData\@\@QEBAAEBVGameRules\@\@XZ */ MCAPI class GameRules const & getGameRules() const; + /** + * @symbol ?getGameRules\@LevelData\@\@QEAAAEAVGameRules\@\@XZ + */ + MCAPI class GameRules & getGameRules(); /** * @symbol ?getGameType\@LevelData\@\@QEBA?AW4GameType\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/LevelEventCoordinator.hpp b/LiteLoader/include/llapi/mc/LevelEventCoordinator.hpp index dc756c3dfa..d2785c85a4 100644 --- a/LiteLoader/include/llapi/mc/LevelEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/LevelEventCoordinator.hpp @@ -5,6 +5,8 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Tag.hpp" +#include "Int64Tag.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -15,7 +17,7 @@ * @brief MC class LevelEventCoordinator. * */ -class LevelEventCoordinator { +class LevelEventCoordinator : public Int64Tag { #define AFTER_EXTRA // Add Member There @@ -28,6 +30,340 @@ class LevelEventCoordinator { #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 diff --git a/LiteLoader/include/llapi/mc/LevelEventGenericPacket.hpp b/LiteLoader/include/llapi/mc/LevelEventGenericPacket.hpp index 9652a162fb..fdb2750b8c 100644 --- a/LiteLoader/include/llapi/mc/LevelEventGenericPacket.hpp +++ b/LiteLoader/include/llapi/mc/LevelEventGenericPacket.hpp @@ -51,22 +51,22 @@ class LevelEventGenericPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@LevelEventGenericPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@LevelEventGenericPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LEVELEVENTGENERICPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~LevelEventGenericPacket(); #endif - /** - * @symbol ??0LevelEventGenericPacket\@\@QEAA\@W4LevelEvent\@\@AEBVCompoundTag\@\@\@Z - */ - MCAPI LevelEventGenericPacket(enum class LevelEvent, class CompoundTag const &); /** * @symbol ??0LevelEventGenericPacket\@\@QEAA\@XZ */ MCAPI LevelEventGenericPacket(); + /** + * @symbol ??0LevelEventGenericPacket\@\@QEAA\@W4LevelEvent\@\@AEBVCompoundTag\@\@\@Z + */ + MCAPI LevelEventGenericPacket(enum class LevelEvent, class CompoundTag const &); }; diff --git a/LiteLoader/include/llapi/mc/LevelEventListener.hpp b/LiteLoader/include/llapi/mc/LevelEventListener.hpp index e0a1ab35bb..8f581d4d6e 100644 --- a/LiteLoader/include/llapi/mc/LevelEventListener.hpp +++ b/LiteLoader/include/llapi/mc/LevelEventListener.hpp @@ -54,10 +54,6 @@ class LevelEventListener { * @symbol ?onLevelRemovedPlayer\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@AEAVPlayer\@\@\@Z */ MCVAPI enum class EventResult onLevelRemovedPlayer(class Level &, class Player &); - /** - * @symbol ?onLevelSaveData\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@AEAVCompoundTag\@\@\@Z - */ - MCVAPI enum class EventResult onLevelSaveData(class Level &, class CompoundTag &); /** * @symbol ?onLevelTick\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LevelEventPacket.hpp b/LiteLoader/include/llapi/mc/LevelEventPacket.hpp index 8328b3c189..4446dd5cfc 100644 --- a/LiteLoader/include/llapi/mc/LevelEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/LevelEventPacket.hpp @@ -51,9 +51,9 @@ class LevelEventPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@LevelEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@LevelEventPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LEVELEVENTPACKET /** * @symbol __unk_destructor_-1 @@ -64,13 +64,13 @@ class LevelEventPacket : public Packet { * @symbol ??0LevelEventPacket\@\@QEAA\@W4LevelEvent\@\@MMMH\@Z */ MCAPI LevelEventPacket(enum class LevelEvent, float, float, float, int); - /** - * @symbol ??0LevelEventPacket\@\@QEAA\@W4LevelEvent\@\@AEBVVec3\@\@H\@Z - */ - MCAPI LevelEventPacket(enum class LevelEvent, class Vec3 const &, int); /** * @symbol ??0LevelEventPacket\@\@QEAA\@XZ */ MCAPI LevelEventPacket(); + /** + * @symbol ??0LevelEventPacket\@\@QEAA\@W4LevelEvent\@\@AEBVVec3\@\@H\@Z + */ + MCAPI LevelEventPacket(enum class LevelEvent, class Vec3 const &, int); }; diff --git a/LiteLoader/include/llapi/mc/LevelSettings.hpp b/LiteLoader/include/llapi/mc/LevelSettings.hpp index 2d65aafb67..a3eddcf06d 100644 --- a/LiteLoader/include/llapi/mc/LevelSettings.hpp +++ b/LiteLoader/include/llapi/mc/LevelSettings.hpp @@ -29,21 +29,21 @@ class LevelSettings { public: /** - * @symbol ??0LevelSettings\@\@QEAA\@AEBVLevelData\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ??0LevelSettings\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI LevelSettings(class LevelData const &, class AutomaticID); + MCAPI LevelSettings(class LevelSettings &&); /** * @symbol ??0LevelSettings\@\@QEAA\@XZ */ MCAPI LevelSettings(); - /** - * @symbol ??0LevelSettings\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI LevelSettings(class LevelSettings &&); /** * @symbol ??0LevelSettings\@\@QEAA\@AEBV0\@\@Z */ MCAPI LevelSettings(class LevelSettings const &); + /** + * @symbol ??0LevelSettings\@\@QEAA\@AEBVLevelData\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + */ + MCAPI LevelSettings(class LevelData const &, class AutomaticID); /** * @symbol ?achievementsWillBeDisabledOnLoad\@LevelSettings\@\@QEBA_NXZ */ @@ -228,6 +228,10 @@ class LevelSettings { * @symbol ?isFromWorldTemplate\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool isFromWorldTemplate() const; + /** + * @symbol ?isRandomSeedAllowed\@LevelSettings\@\@QEBA_NXZ + */ + MCAPI bool isRandomSeedAllowed() const; /** * @symbol ?isTexturepacksRequired\@LevelSettings\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/LevelSoundEventPacket.hpp b/LiteLoader/include/llapi/mc/LevelSoundEventPacket.hpp index 2f1f44bfd8..01be7f7866 100644 --- a/LiteLoader/include/llapi/mc/LevelSoundEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/LevelSoundEventPacket.hpp @@ -51,9 +51,9 @@ class LevelSoundEventPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@LevelSoundEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@LevelSoundEventPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 0b6bff2706..b63a899b86 100644 --- a/LiteLoader/include/llapi/mc/LevelSoundEventPacketV1.hpp +++ b/LiteLoader/include/llapi/mc/LevelSoundEventPacketV1.hpp @@ -51,9 +51,9 @@ class LevelSoundEventPacketV1 : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@LevelSoundEventPacketV1\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@LevelSoundEventPacketV1\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0LevelSoundEventPacketV1\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/LevelSoundEventPacketV2.hpp b/LiteLoader/include/llapi/mc/LevelSoundEventPacketV2.hpp index df0bb2ac9c..758b2730e7 100644 --- a/LiteLoader/include/llapi/mc/LevelSoundEventPacketV2.hpp +++ b/LiteLoader/include/llapi/mc/LevelSoundEventPacketV2.hpp @@ -51,9 +51,9 @@ class LevelSoundEventPacketV2 : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@LevelSoundEventPacketV2\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@LevelSoundEventPacketV2\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0LevelSoundEventPacketV2\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/LevelSoundManager.hpp b/LiteLoader/include/llapi/mc/LevelSoundManager.hpp index 53dd6b7fbb..16d287a637 100644 --- a/LiteLoader/include/llapi/mc/LevelSoundManager.hpp +++ b/LiteLoader/include/llapi/mc/LevelSoundManager.hpp @@ -32,9 +32,9 @@ class LevelSoundManager { MCVAPI ~LevelSoundManager(); #endif /** - * @symbol ??0LevelSoundManager\@\@QEAA\@AEBV?$not_null\@V?$NonOwnerPointer\@VSoundPlayerInterface\@\@\@Bedrock\@\@\@gsl\@\@_N\@Z + * @symbol ??0LevelSoundManager\@\@QEAA\@AEBV?$not_null\@V?$NonOwnerPointer\@VSoundPlayerInterface\@\@\@Bedrock\@\@\@gsl\@\@_N1\@Z */ - MCAPI LevelSoundManager(class gsl::not_null> const &, bool); + MCAPI LevelSoundManager(class gsl::not_null> const &, bool, bool); /** * @symbol ?broadcastSoundEvent\@LevelSoundManager\@\@QEAAXAEAVIDimension\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4PEAVPlayer\@\@\@Z */ @@ -44,29 +44,17 @@ class LevelSoundManager { */ MCAPI class gsl::not_null> getSoundPlayer() const; /** - * @symbol ?handleSoundEvent\@LevelSoundManager\@\@QEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z - */ - MCAPI void handleSoundEvent(enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); - /** - * @symbol ?handleSoundEvent\@LevelSoundManager\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVec3\@\@MM\@Z - */ - MCAPI void handleSoundEvent(std::string const &, class Vec3 const &, float, float); - /** - * @symbol ?handleStopAllSounds\@LevelSoundManager\@\@QEAAXXZ - */ - MCAPI void handleStopAllSounds(); - /** - * @symbol ?handleStopSoundEvent\@LevelSoundManager\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?playSound\@LevelSoundManager\@\@QEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@MM\@Z */ - MCAPI void handleStopSoundEvent(std::string const &); + MCAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, float, float); /** * @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 + * @symbol ?playSound\@LevelSoundManager\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVec3\@\@MM\@Z */ - MCAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, float, float); + MCAPI void playSound(std::string const &, class Vec3 const &, float, float); /** * @symbol ?playSoundForPlayerInDimension\@LevelSoundManager\@\@QEAAXV?$AutomaticID\@VDimension\@\@H\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4PEAVPlayer\@\@\@Z */ @@ -76,9 +64,9 @@ class LevelSoundManager { */ MCAPI void playSynchronizedSound(class IDimension &, enum class LevelSoundEvent, class Vec3 const &, class Player *, int, struct ActorDefinitionIdentifier const &, bool, bool); /** - * @symbol ?registerOnHandleLevelSoundEventCallback\@LevelSoundManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z\@std\@\@\@Z + * @symbol ?registerOnLevelSoundEventCallback\@LevelSoundManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z\@std\@\@\@Z */ - MCAPI class Bedrock::PubSub::Subscription registerOnHandleLevelSoundEventCallback(class std::function); + MCAPI class Bedrock::PubSub::Subscription registerOnLevelSoundEventCallback(class std::function); /** * @symbol ?setLevelEventCoordinator\@LevelSoundManager\@\@QEAAXV?$shared_ptr\@VLevelEventCoordinator\@\@\@std\@\@\@Z */ @@ -87,5 +75,13 @@ class LevelSoundManager { * @symbol ?setPacketSender\@LevelSoundManager\@\@QEAAXAEAVPacketSender\@\@\@Z */ MCAPI void setPacketSender(class PacketSender &); + /** + * @symbol ?stopAllSounds\@LevelSoundManager\@\@QEAAXXZ + */ + MCAPI void stopAllSounds(); + /** + * @symbol ?stopSoundEvent\@LevelSoundManager\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI void stopSoundEvent(std::string const &); }; diff --git a/LiteLoader/include/llapi/mc/LevelStorageManager.hpp b/LiteLoader/include/llapi/mc/LevelStorageManager.hpp new file mode 100644 index 0000000000..a9821801bb --- /dev/null +++ b/LiteLoader/include/llapi/mc/LevelStorageManager.hpp @@ -0,0 +1,69 @@ +/** + * @file LevelStorageManager.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Bedrock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class LevelStorageManager { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LEVELSTORAGEMANAGER +public: + class LevelStorageManager& operator=(class LevelStorageManager const &) = delete; + LevelStorageManager(class LevelStorageManager const &) = delete; + LevelStorageManager() = delete; +#endif + +public: + /** + * @symbol ??0LevelStorageManager\@\@QEAA\@V?$unique_ptr\@VLevelStorage\@\@U?$default_delete\@VLevelStorage\@\@\@std\@\@\@std\@\@\@Z + */ + MCAPI LevelStorageManager(std::unique_ptr); + /** + * @symbol ?getLevelStorage\@LevelStorageManager\@\@QEAAPEAVLevelStorage\@\@XZ + */ + MCAPI class LevelStorage * getLevelStorage(); + /** + * @symbol ?getLevelStorage\@LevelStorageManager\@\@QEBAPEBVLevelStorage\@\@XZ + */ + MCAPI class LevelStorage const * getLevelStorage() const; + /** + * @symbol ?getSavedDataStorage\@LevelStorageManager\@\@QEAAAEAVSavedDataStorage\@\@XZ + */ + MCAPI class SavedDataStorage & getSavedDataStorage(); + /** + * @symbol ?registerOnSaveGameDataCallback\@LevelStorageManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEAVLevelStorage\@\@\@Z\@std\@\@\@Z + */ + MCAPI class Bedrock::PubSub::Subscription registerOnSaveGameDataCallback(class std::function); + /** + * @symbol ?registerOnSaveLevelDataCallback\@LevelStorageManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEAVLevelStorage\@\@\@Z\@std\@\@\@Z + */ + MCAPI class Bedrock::PubSub::Subscription registerOnSaveLevelDataCallback(class std::function); + /** + * @symbol ?saveGameData\@LevelStorageManager\@\@QEAAXXZ + */ + MCAPI void saveGameData(); + /** + * @symbol ?saveLevelData\@LevelStorageManager\@\@QEAAXXZ + */ + MCAPI void saveLevelData(); + /** + * @symbol ?shutdown\@LevelStorageManager\@\@QEAAXXZ + */ + MCAPI void shutdown(); + /** + * @symbol ??1LevelStorageManager\@\@QEAA\@XZ + */ + MCAPI ~LevelStorageManager(); + +}; diff --git a/LiteLoader/include/llapi/mc/LevelSummary.hpp b/LiteLoader/include/llapi/mc/LevelSummary.hpp index c41c618633..d7d2e880d7 100644 --- a/LiteLoader/include/llapi/mc/LevelSummary.hpp +++ b/LiteLoader/include/llapi/mc/LevelSummary.hpp @@ -26,17 +26,17 @@ struct LevelSummary { */ 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\@XZ + * @symbol ??0LevelSummary\@\@QEAA\@AEBU0\@\@Z */ - MCAPI LevelSummary(); + MCAPI LevelSummary(struct LevelSummary const &); /** * @symbol ??0LevelSummary\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVLevelData\@\@AEBVPath\@Core\@\@2_N\@Z */ MCAPI LevelSummary(std::string const &, class LevelData const &, class Core::Path const &, class Core::Path const &, bool); /** - * @symbol ??0LevelSummary\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0LevelSummary\@\@QEAA\@XZ */ - MCAPI LevelSummary(struct LevelSummary const &); + MCAPI LevelSummary(); /** * @symbol ??4LevelSummary\@\@QEAAAEAU0\@AEBU0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LeverBlock.hpp b/LiteLoader/include/llapi/mc/LeverBlock.hpp index 29baa6f257..8cb9435e01 100644 --- a/LiteLoader/include/llapi/mc/LeverBlock.hpp +++ b/LiteLoader/include/llapi/mc/LeverBlock.hpp @@ -45,16 +45,21 @@ class LeverBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class LeverBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class LeverBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,187 +136,182 @@ class LeverBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 51 + * @vftbl 50 * @symbol ?isSignalSource\@LeverBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_53(); /** - * @vftbl 58 + * @vftbl 57 * @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 + */ + 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 64 + * @vftbl 63 * @symbol ?shouldConnectToRedstone\@LeverBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@LeverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 91 + * @vftbl 90 * @symbol ?mayPlace\@LeverBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@LeverBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@LeverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 108 + * @vftbl 107 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@LeverBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 148 + * @vftbl 146 * @symbol ?canSpawnOn\@LeverBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@LeverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@LeverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@LeverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@LeverBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@LeverBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 195 + * @vftbl 194 * @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 d7d5012daf..8dd79d9f70 100644 --- a/LiteLoader/include/llapi/mc/LightBlock.hpp +++ b/LiteLoader/include/llapi/mc/LightBlock.hpp @@ -60,16 +60,21 @@ class LightBlock : public BlockLegacy { * @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 + */ + virtual void __unk_vfn_28(); /** * @vftbl 29 * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -81,10 +86,10 @@ class LightBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -116,10 +121,10 @@ class LightBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -146,160 +151,155 @@ class LightBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 83 * @symbol ?isFilteredOut\@LightBlock\@\@UEBA_NW4BlockRenderLayer\@\@\@Z */ virtual bool isFilteredOut(enum class BlockRenderLayer) const; /** - * @vftbl 91 + * @vftbl 90 * @symbol ?mayPlace\@LightBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@LightBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 94 + * @vftbl 93 * @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 103 + * @vftbl 102 * @symbol ?asItemInstance\@LightBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 114 + * @vftbl 113 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@LightBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 153 + * @vftbl 151 * @symbol ?init\@LightBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 154 + * @vftbl 152 * @symbol ?getLightEmission\@LightBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@LightBlock\@\@MEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 7e15d81585..1ab6713155 100644 --- a/LiteLoader/include/llapi/mc/LightningBolt.hpp +++ b/LiteLoader/include/llapi/mc/LightningBolt.hpp @@ -46,125 +46,120 @@ class LightningBolt : public Actor { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@LightningBolt\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 80 + * @vftbl 78 * @symbol ?getShadowRadius\@LightningBolt\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 - */ - virtual void __unk_vfn_243(); - /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@LightningBolt\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@LightningBolt\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LIGHTNINGBOLT /** * @symbol ?shouldAlwaysRender\@LightningBolt\@\@UEAA_NXZ diff --git a/LiteLoader/include/llapi/mc/LightningRod.hpp b/LiteLoader/include/llapi/mc/LightningRodBlock.hpp similarity index 52% rename from LiteLoader/include/llapi/mc/LightningRod.hpp rename to LiteLoader/include/llapi/mc/LightningRodBlock.hpp index aec4f87ee9..3282ef198d 100644 --- a/LiteLoader/include/llapi/mc/LightningRod.hpp +++ b/LiteLoader/include/llapi/mc/LightningRodBlock.hpp @@ -1,5 +1,5 @@ /** - * @file LightningRod.hpp + * @file LightningRodBlock.hpp * */ #pragma once @@ -8,25 +8,20 @@ #include "BlockLegacy.hpp" #define BEFORE_EXTRA -// Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC class LightningRod. - * - */ -class LightningRod : public BlockLegacy { + +class LightningRodBlock : public BlockLegacy { #define AFTER_EXTRA -// Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LIGHTNINGROD +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LIGHTNINGRODBLOCK public: - class LightningRod& operator=(class LightningRod const &) = delete; - LightningRod(class LightningRod const &) = delete; - LightningRod() = delete; + class LightningRodBlock& operator=(class LightningRodBlock const &) = delete; + LightningRodBlock(class LightningRodBlock const &) = delete; + LightningRodBlock() = delete; #endif public: @@ -37,12 +32,12 @@ class LightningRod : public BlockLegacy { virtual void __unk_vfn_0(); /** * @vftbl 15 - * @symbol ?onProjectileHit\@LightningRod\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z + * @symbol ?onProjectileHit\@LightningRodBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z */ virtual void onProjectileHit(class BlockSource &, class BlockPos const &, class Actor const &) const; /** * @vftbl 16 - * @symbol ?onLightningHit\@LightningRod\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?onLightningHit\@LightningRodBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onLightningHit(class BlockSource &, class BlockPos const &) const; /** @@ -52,24 +47,29 @@ class LightningRod : public BlockLegacy { virtual void __unk_vfn_19(); /** * @vftbl 22 - * @symbol ?canProvideSupport\@LightningRod\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @symbol ?canProvideSupport\@LightningRodBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** * @vftbl 25 - * @symbol ?canConnect\@LightningRod\@\@UEBA_NAEBVBlock\@\@E0\@Z + * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -81,10 +81,10 @@ class LightningRod : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -116,10 +116,10 @@ class LightningRod : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -146,20 +146,20 @@ class LightningRod : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 50 + * @symbol ?isSignalSource\@LightningRodBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_49(); + virtual bool isSignalSource() const; /** - * @vftbl 51 - * @symbol ?isSignalSource\@LightningRod\@\@UEBA_NXZ + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual bool isSignalSource() const; + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -167,137 +167,132 @@ class LightningRod : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 - * @symbol ?canContainLiquid\@LightningRod\@\@UEBA_NXZ + * @symbol ?canContainLiquid\@LightningRodBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 64 - * @symbol ?shouldConnectToRedstone\@LightningRod\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 63 + * @symbol ?shouldConnectToRedstone\@LightningRodBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@LightningRod\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 78 + * @symbol ?setupRedstoneComponent\@LightningRodBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@LightningRod\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 95 + * @symbol ?breaksFallingBlocks\@LightningRodBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@LightningRod\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 105 + * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 144 - * @symbol ?getVisualShape\@LightningRod\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 142 + * @symbol ?getVisualShape\@LightningRodBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 152 - * @symbol ?animateTick\@LightningRod\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 150 + * @symbol ?animateTick\@LightningRodBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 - * @symbol ?onPlace\@LightningRod\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 167 + * @symbol ?onPlace\@LightningRodBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 - * @symbol ?tick\@LightningRod\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 170 + * @symbol ?tick\@LightningRodBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @symbol ??0LightningRod\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0LightningRodBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ - MCAPI LightningRod(std::string const &, int, class Material const &); + MCAPI LightningRodBlock(std::string const &, int, class Material const &); }; diff --git a/LiteLoader/include/llapi/mc/LingeringPotionItem.hpp b/LiteLoader/include/llapi/mc/LingeringPotionItem.hpp index ce3efc0e03..73687d0c4f 100644 --- a/LiteLoader/include/llapi/mc/LingeringPotionItem.hpp +++ b/LiteLoader/include/llapi/mc/LingeringPotionItem.hpp @@ -37,11 +37,6 @@ class LingeringPotionItem : public PotionItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -57,6 +52,11 @@ class LingeringPotionItem : public PotionItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 23 * @symbol ?isThrowable\@LingeringPotionItem\@\@UEBA_NXZ @@ -128,17 +128,27 @@ class LingeringPotionItem : public PotionItem { */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 117 + * @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\@LingeringPotionItem\@\@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 118 + * @vftbl 120 * @symbol ?getIconInfo\@LingeringPotionItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 133 + * @vftbl 135 * @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 5d705dd12b..1309e9cba0 100644 --- a/LiteLoader/include/llapi/mc/LiquidBlock.hpp +++ b/LiteLoader/include/llapi/mc/LiquidBlock.hpp @@ -45,16 +45,21 @@ class LiquidBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class LiquidBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class LiquidBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,15 +136,15 @@ class LiquidBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -147,146 +152,141 @@ class LiquidBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@LiquidBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 69 + * @vftbl 68 * @symbol ?checkIsPathable\@LiquidBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 90 + * @vftbl 89 * @symbol ?mayPick\@LiquidBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z */ virtual bool mayPick(class BlockSource const &, class Block const &, bool) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@LiquidBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 110 + * @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 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 136 + * @vftbl 134 * @symbol ?getColor\@LiquidBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 138 + * @vftbl 136 * @symbol ?getColorAtPos\@LiquidBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getColorAtPos(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 141 + * @vftbl 139 * @symbol ?onGraphicsModeChanged\@LiquidBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@LiquidBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@LiquidBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 186 + * @vftbl 185 * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 190 + * @vftbl 189 * @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 4af2aeecd1..3c049c32d8 100644 --- a/LiteLoader/include/llapi/mc/LiquidBlockDynamic.hpp +++ b/LiteLoader/include/llapi/mc/LiquidBlockDynamic.hpp @@ -40,16 +40,21 @@ class LiquidBlockDynamic : public LiquidBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class LiquidBlockDynamic : public LiquidBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class LiquidBlockDynamic : public LiquidBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,75 +131,80 @@ class LiquidBlockDynamic : public LiquidBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 113 + * @vftbl 112 * @symbol ?entityInside\@LiquidBlockDynamic\@\@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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -202,44 +212,34 @@ class LiquidBlockDynamic : public LiquidBlock { 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 ?onPlace\@LiquidBlockDynamic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@LiquidBlockDynamic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 1ce039f725..5c5ad1d453 100644 --- a/LiteLoader/include/llapi/mc/LiquidBlockStatic.hpp +++ b/LiteLoader/include/llapi/mc/LiquidBlockStatic.hpp @@ -40,16 +40,21 @@ class LiquidBlockStatic : public LiquidBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class LiquidBlockStatic : public LiquidBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class LiquidBlockStatic : public LiquidBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,120 +131,115 @@ class LiquidBlockStatic : public LiquidBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@LiquidBlockStatic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 113 + * @vftbl 112 * @symbol ?entityInside\@LiquidBlockStatic\@\@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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_169(); /** * @vftbl 171 - * @symbol __unk_vfn_171 - */ - virtual void __unk_vfn_171(); - /** - * @vftbl 173 * @symbol ?randomTick\@LiquidBlockStatic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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/LiquidSplashRequestSystem.hpp b/LiteLoader/include/llapi/mc/LiquidSplashRequestSystem.hpp index ba39995450..9f771f1842 100644 --- a/LiteLoader/include/llapi/mc/LiquidSplashRequestSystem.hpp +++ b/LiteLoader/include/llapi/mc/LiquidSplashRequestSystem.hpp @@ -10,38 +10,15 @@ #undef BEFORE_EXTRA -/** - * @brief MC class LiquidSplashRequestSystem. - * - */ -class LiquidSplashRequestSystem { + +namespace LiquidSplashRequestSystem { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LIQUIDSPLASHREQUESTSYSTEM -public: - class LiquidSplashRequestSystem& operator=(class LiquidSplashRequestSystem const &) = delete; - LiquidSplashRequestSystem(class LiquidSplashRequestSystem const &) = delete; - LiquidSplashRequestSystem() = delete; -#endif - -public: /** - * @symbol ?createSystem\@LiquidSplashRequestSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@LiquidSplashRequestSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static struct TickingSystemWithInfo createSystem(); - -//private: - /** - * @symbol ?_liquidSplashRequest\@LiquidSplashRequestSystem\@\@CAXAEAVStrictEntityContext\@\@AEBUUpdateWaterStateRequestComponent\@\@V?$Optional\@$$CBUPlayerGameTypeComponent\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UInLavaFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UPostSplashGameEventRequestFlag\@\@\@\@V?$FlagComponent\@UWaterSplashEffectRequestFlag\@\@\@\@\@\@\@Z - */ - MCAPI static void _liquidSplashRequest(class StrictEntityContext &, struct UpdateWaterStateRequestComponent const &, class Optional, class Optional const>, class Optional const>, class EntityModifierT, class FlagComponent>); - /** - * @symbol ?_tick\@LiquidSplashRequestSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Exclude\@UPassengerComponent\@\@\@\@$$CBUUpdateWaterStateRequestComponent\@\@V?$Optional\@$$CBUPlayerGameTypeComponent\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UInLavaFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UPostSplashGameEventRequestFlag\@\@\@\@V?$FlagComponent\@UWaterSplashEffectRequestFlag\@\@\@\@\@\@\@Z - */ - MCAPI static void _tick(class ViewT, struct UpdateWaterStateRequestComponent const, class Optional, class Optional const>, class Optional const>>, class EntityModifierT, class FlagComponent>); - -private: + MCAPI struct TickingSystemWithInfo createSystem(); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/LiquidSplashRequestSystemImpl.hpp b/LiteLoader/include/llapi/mc/LiquidSplashRequestSystemImpl.hpp new file mode 100644 index 0000000000..27f9871aa6 --- /dev/null +++ b/LiteLoader/include/llapi/mc/LiquidSplashRequestSystemImpl.hpp @@ -0,0 +1,24 @@ +/** + * @file LiquidSplashRequestSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace LiquidSplashRequestSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?doTick\@LiquidSplashRequestSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEBUUpdateWaterStateRequestComponent\@\@AEBV?$Optional\@$$CBUActorGameTypeComponent\@\@\@\@AEBV?$Optional\@$$CBV?$FlagComponent\@UInLavaFlag\@\@\@\@\@\@AEBV?$Optional\@$$CBV?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UPostSplashGameEventRequestFlag\@\@\@\@V?$FlagComponent\@UWaterSplashEffectRequestFlag\@\@\@\@\@\@AEBUExternalDataInterface\@\@\@Z + */ + MCAPI void doTick(class StrictEntityContext const &, struct UpdateWaterStateRequestComponent const &, class Optional const &, class Optional const> const &, class Optional const> const &, class EntityModifierT, class FlagComponent>, struct ExternalDataInterface const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ListTag.hpp b/LiteLoader/include/llapi/mc/ListTag.hpp index 8d33135556..af26c171b1 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 ?write\@ListTag\@\@UEBAXAEAVIDataOutput\@\@\@Z + * @symbol __unk_vfn_2 */ - virtual void write(class IDataOutput &) const; + virtual void __unk_vfn_2(); /** * @vftbl 3 * @symbol ?load\@ListTag\@\@UEAAXAEAVIDataInput\@\@\@Z @@ -114,6 +114,10 @@ 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 858daf75c6..41fe5d5d06 100644 --- a/LiteLoader/include/llapi/mc/Llama.hpp +++ b/LiteLoader/include/llapi/mc/Llama.hpp @@ -37,150 +37,145 @@ class Llama : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 122 + * @vftbl 120 * @symbol ?onFailedTame\@Llama\@\@UEAAXXZ */ virtual void onFailedTame(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 182 + * @vftbl 180 * @symbol ?causeFallDamage\@Llama\@\@MEAAXMMVActorDamageSource\@\@\@Z */ virtual void causeFallDamage(float, float, class ActorDamageSource); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 258 + * @vftbl 250 * @symbol ?updateEntitySpecificMolangVariables\@Llama\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 266 + * @vftbl 258 * @symbol ?_playStepSound\@Llama\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 310 + * @vftbl 302 * @symbol ?getArmorValue\@Llama\@\@UEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0Llama\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LlamaSpit.hpp b/LiteLoader/include/llapi/mc/LlamaSpit.hpp index 52817f51fc..c6c9cd1668 100644 --- a/LiteLoader/include/llapi/mc/LlamaSpit.hpp +++ b/LiteLoader/include/llapi/mc/LlamaSpit.hpp @@ -37,135 +37,130 @@ class LlamaSpit : public PredictableProjectile { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@LlamaSpit\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 79 + * @vftbl 77 * @symbol ?getShadowHeightOffs\@LlamaSpit\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** * @vftbl 85 - * @symbol __unk_vfn_85 - */ - virtual void __unk_vfn_85(); - /** - * @vftbl 87 * @symbol ?getBrightness\@LlamaSpit\@\@UEBAMMAEBVIConstBlockSource\@\@\@Z */ virtual float getBrightness(float, class IConstBlockSource const &) const; /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_86(); /** - * @vftbl 95 + * @vftbl 93 * @symbol ?isPickable\@LlamaSpit\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_94(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_97(); + /** + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 142 + * @vftbl 140 * @symbol ?getPickRadius\@LlamaSpit\@\@UEAAMXZ */ virtual float getPickRadius(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?getSourceUniqueID\@LlamaSpit\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 + */ + virtual void __unk_vfn_176(); + /** + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); - /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); /** * @symbol ??0LlamaSpit\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LodestoneBlock.hpp b/LiteLoader/include/llapi/mc/LodestoneBlock.hpp index 8ca81cde78..511c2e0961 100644 --- a/LiteLoader/include/llapi/mc/LodestoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/LodestoneBlock.hpp @@ -40,16 +40,21 @@ class LodestoneBlock : public ActorBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class LodestoneBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class LodestoneBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,110 +131,105 @@ class LodestoneBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 101 + * @vftbl 100 * @symbol ?playerWillDestroy\@LodestoneBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 4865e6a11c..06c3947b33 100644 --- a/LiteLoader/include/llapi/mc/LodestoneBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/LodestoneBlockActor.hpp @@ -91,17 +91,17 @@ class LodestoneBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); /** - * @vftbl 37 + * @vftbl 39 * @symbol ?_getUpdatePacket\@LodestoneBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 38 + * @vftbl 40 * @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 32828b0952..8c4126dd99 100644 --- a/LiteLoader/include/llapi/mc/LodestoneCompassItem.hpp +++ b/LiteLoader/include/llapi/mc/LodestoneCompassItem.hpp @@ -36,11 +36,6 @@ class LodestoneCompassItem : public AbstractCompassItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class LodestoneCompassItem : public AbstractCompassItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -102,12 +102,22 @@ class LodestoneCompassItem : public AbstractCompassItem { */ virtual void __unk_vfn_80(); /** - * @vftbl 120 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 122 * @symbol ?getAnimationFrameFor\@LodestoneCompassItem\@\@UEBAHPEAVMob\@\@_NPEBVItemStack\@\@_N\@Z */ virtual int getAnimationFrameFor(class Mob *, bool, class ItemStack const *, bool) const; /** - * @vftbl 132 + * @vftbl 134 * @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; diff --git a/LiteLoader/include/llapi/mc/LogBlock.hpp b/LiteLoader/include/llapi/mc/LogBlock.hpp index a65a4c5519..5e85664878 100644 --- a/LiteLoader/include/llapi/mc/LogBlock.hpp +++ b/LiteLoader/include/llapi/mc/LogBlock.hpp @@ -40,16 +40,21 @@ class LogBlock : public RotatedPillarBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class LogBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class LogBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,127 +131,122 @@ class LogBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@LogBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@LogBlock\@\@MEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 186 + * @vftbl 185 * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@LogBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @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 9c5fea5d14..d73494d47c 100644 --- a/LiteLoader/include/llapi/mc/LoginPacket.hpp +++ b/LiteLoader/include/llapi/mc/LoginPacket.hpp @@ -59,9 +59,9 @@ class LoginPacket : public Packet { virtual bool disallowBatching() const; /** * @vftbl 7 - * @symbol ?_read\@LoginPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@LoginPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0LoginPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/LoomBlock.hpp b/LiteLoader/include/llapi/mc/LoomBlock.hpp index 93170ca627..b6005aba21 100644 --- a/LiteLoader/include/llapi/mc/LoomBlock.hpp +++ b/LiteLoader/include/llapi/mc/LoomBlock.hpp @@ -40,16 +40,21 @@ class LoomBlock : public FaceDirectionalBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class LoomBlock : public FaceDirectionalBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class LoomBlock : public FaceDirectionalBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,110 +131,105 @@ class LoomBlock : public FaceDirectionalBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@LoomBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LOOMBLOCK /** * @symbol ?isCraftingBlock\@LoomBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/MC_ANONYMOUS.hpp b/LiteLoader/include/llapi/mc/MC_ANONYMOUS.hpp deleted file mode 100644 index 30c4ab9800..0000000000 --- a/LiteLoader/include/llapi/mc/MC_ANONYMOUS.hpp +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file MC_ANONYMOUS.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -namespace MC_ANONYMOUS { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA - /** - * @symbol ?sendMessage\@MC_ANONYMOUS\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUCommandOriginIdentity\@\@AEBVLevel\@\@\@Z - */ - MCAPI void sendMessage(std::string const &, struct CommandOriginIdentity const &, class Level const &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MagmaBlock.hpp b/LiteLoader/include/llapi/mc/MagmaBlock.hpp index 2307e0eafc..f0feb050cc 100644 --- a/LiteLoader/include/llapi/mc/MagmaBlock.hpp +++ b/LiteLoader/include/llapi/mc/MagmaBlock.hpp @@ -40,16 +40,21 @@ class MagmaBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class MagmaBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class MagmaBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,135 +131,159 @@ class MagmaBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@MagmaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@MagmaBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@MagmaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@MagmaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 + * @vftbl 171 * @symbol ?randomTick\@MagmaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 185 + * @vftbl 184 * @symbol ?getEmissiveBrightness\@MagmaBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getEmissiveBrightness(class Block const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @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 */ - virtual void __unk_vfn_187(); + MCAPI std::string const & getDescriptionId() const; #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 new file mode 100644 index 0000000000..3544e05131 --- /dev/null +++ b/LiteLoader/include/llapi/mc/MangroveLeavesBlock.hpp @@ -0,0 +1,248 @@ +/** + * @file MangroveLeavesBlock.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "LeavesBlock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class MangroveLeavesBlock : public LeavesBlock { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_MANGROVELEAVESBLOCK +public: + class MangroveLeavesBlock& operator=(class MangroveLeavesBlock const &) = delete; + MangroveLeavesBlock(class MangroveLeavesBlock const &) = delete; + MangroveLeavesBlock() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + 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(); + /** + * @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 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 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 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @vftbl 59 + * @symbol __unk_vfn_59 + */ + virtual void __unk_vfn_59(); + /** + * @vftbl 60 + * @symbol __unk_vfn_60 + */ + virtual void __unk_vfn_60(); + /** + * @vftbl 74 + * @symbol __unk_vfn_74 + */ + virtual void __unk_vfn_74(); + /** + * @vftbl 81 + * @symbol __unk_vfn_81 + */ + virtual void __unk_vfn_81(); + /** + * @vftbl 85 + * @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 + * @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 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); + /** + * @vftbl 123 + * @symbol __unk_vfn_123 + */ + virtual void __unk_vfn_123(); + /** + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 + */ + virtual void __unk_vfn_127(); + /** + * @vftbl 130 + * @symbol __unk_vfn_130 + */ + virtual void __unk_vfn_130(); + /** + * @vftbl 155 + * @symbol __unk_vfn_155 + */ + virtual void __unk_vfn_155(); + /** + * @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 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@MangroveLeavesBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + */ + virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + /** + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@MangroveLeavesBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + */ + virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; + /** + * @symbol ??0MangroveLeavesBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HV?$WeakPtr\@VBlockLegacy\@\@\@\@\@Z + */ + MCAPI MangroveLeavesBlock(std::string const &, int, class WeakPtr); + +}; diff --git a/LiteLoader/include/llapi/mc/MangrovePropagule.hpp b/LiteLoader/include/llapi/mc/MangrovePropagule.hpp deleted file mode 100644 index b340a52eb9..0000000000 --- a/LiteLoader/include/llapi/mc/MangrovePropagule.hpp +++ /dev/null @@ -1,357 +0,0 @@ -/** - * @file MangrovePropagule.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "BlockLegacy.hpp" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class MangrovePropagule. - * - */ -class MangrovePropagule : public BlockLegacy { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_MANGROVEPROPAGULE -public: - class MangrovePropagule& operator=(class MangrovePropagule const &) = delete; - MangrovePropagule(class MangrovePropagule const &) = delete; - MangrovePropagule() = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 8 - * @symbol ?randomlyModifyPosition\@MangrovePropagule\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z - */ - virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; - /** - * @vftbl 10 - * @symbol ?getAABB\@MangrovePropagule\@\@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 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); - /** - * @vftbl 30 - * @symbol __unk_vfn_30 - */ - virtual void __unk_vfn_30(); - /** - * @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 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 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 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @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 ?canContainLiquid\@MangrovePropagule\@\@UEBA_NXZ - */ - virtual bool canContainLiquid() const; - /** - * @vftbl 75 - * @symbol __unk_vfn_75 - */ - virtual void __unk_vfn_75(); - /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 86 - * @symbol ?onFertilized\@MangrovePropagule\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z - */ - virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; - /** - * @vftbl 88 - * @symbol ?canBeFertilized\@MangrovePropagule\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z - */ - virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; - /** - * @vftbl 93 - * @symbol ?mayPlaceOn\@MangrovePropagule\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 105 - * @symbol __unk_vfn_105 - */ - virtual void __unk_vfn_105(); - /** - * @vftbl 123 - * @symbol __unk_vfn_123 - */ - virtual void __unk_vfn_123(); - /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 - */ - virtual void __unk_vfn_126(); - /** - * @vftbl 129 - * @symbol __unk_vfn_129 - */ - virtual void __unk_vfn_129(); - /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 144 - * @symbol ?getVisualShape\@MangrovePropagule\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z - */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; - /** - * @vftbl 147 - * @symbol ?getVariant\@MangrovePropagule\@\@UEBAHAEBVBlock\@\@\@Z - */ - virtual int getVariant(class Block const &) const; - /** - * @vftbl 153 - * @symbol ?init\@MangrovePropagule\@\@UEAAAEAVBlockLegacy\@\@XZ - */ - virtual class BlockLegacy & init(); - /** - * @vftbl 157 - * @symbol __unk_vfn_157 - */ - virtual void __unk_vfn_157(); - /** - * @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 171 - * @symbol __unk_vfn_171 - */ - virtual void __unk_vfn_171(); - /** - * @vftbl 173 - * @symbol ?randomTick\@MangrovePropagule\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z - */ - virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; - /** - * @vftbl 175 - * @symbol __unk_vfn_175 - */ - virtual void __unk_vfn_175(); - /** - * @vftbl 179 - * @symbol __unk_vfn_179 - */ - virtual void __unk_vfn_179(); - /** - * @vftbl 180 - * @symbol ?canSurvive\@MangrovePropagule\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 187 - * @symbol __unk_vfn_187 - */ - virtual void __unk_vfn_187(); - /** - * @vftbl 189 - * @symbol ?getResourceItem\@MangrovePropagule\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z - */ - virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; - /** - * @vftbl 190 - * @symbol ?getResourceCount\@MangrovePropagule\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z - */ - virtual int getResourceCount(class Randomize &, class Block const &, int) const; - /** - * @vftbl 191 - * @symbol ?getSilkTouchItemInstance\@MangrovePropagule\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z - */ - virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; - /** - * @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(); - /** - * @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_MANGROVEPROPAGULE - /** - * @symbol ?waterSpreadCausesSpawn\@MangrovePropagule\@\@UEBA_NXZ - */ - MCVAPI bool waterSpreadCausesSpawn() const; -#endif - /** - * @symbol ??0MangrovePropagule\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z - */ - MCAPI MangrovePropagule(std::string const &, int); - -//private: - /** - * @symbol ?_growTree\@MangrovePropagule\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z - */ - MCAPI bool _growTree(class BlockSource &, class BlockPos const &, class Random &) const; - /** - * @symbol ?_isFullyGrown\@MangrovePropagule\@\@AEBA_NAEBVBlock\@\@\@Z - */ - MCAPI bool _isFullyGrown(class Block const &) const; - /** - * @symbol ?_shouldDropMangrovePropaguleItem\@MangrovePropagule\@\@AEBA_NAEBVBlock\@\@\@Z - */ - MCAPI bool _shouldDropMangrovePropaguleItem(class Block const &) const; - -private: - -}; diff --git a/LiteLoader/include/llapi/mc/MangrovePropaguleBlock.hpp b/LiteLoader/include/llapi/mc/MangrovePropaguleBlock.hpp new file mode 100644 index 0000000000..1d0ccb55fb --- /dev/null +++ b/LiteLoader/include/llapi/mc/MangrovePropaguleBlock.hpp @@ -0,0 +1,320 @@ +/** + * @file MangrovePropaguleBlock.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "BushBlock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class MangrovePropaguleBlock : public BushBlock { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_MANGROVEPROPAGULEBLOCK +public: + class MangrovePropaguleBlock& operator=(class MangrovePropaguleBlock const &) = delete; + MangrovePropaguleBlock(class MangrovePropaguleBlock const &) = delete; + MangrovePropaguleBlock() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + 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 + */ + 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(); + /** + * @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 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 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 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @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 ?canContainLiquid\@MangrovePropaguleBlock\@\@UEBA_NXZ + */ + virtual bool canContainLiquid() const; + /** + * @vftbl 74 + * @symbol __unk_vfn_74 + */ + virtual void __unk_vfn_74(); + /** + * @vftbl 81 + * @symbol __unk_vfn_81 + */ + virtual void __unk_vfn_81(); + /** + * @vftbl 85 + * @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 + * @symbol ?canBeFertilized\@MangrovePropaguleBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + */ + virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; + /** + * @vftbl 92 + * @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 + */ + virtual void __unk_vfn_122(); + /** + * @vftbl 123 + * @symbol __unk_vfn_123 + */ + virtual void __unk_vfn_123(); + /** + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 + */ + virtual void __unk_vfn_127(); + /** + * @vftbl 130 + * @symbol __unk_vfn_130 + */ + virtual void __unk_vfn_130(); + /** + * @vftbl 142 + * @symbol ?getVisualShape\@MangrovePropaguleBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + */ + virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + /** + * @vftbl 145 + * @symbol ?getVariant\@MangrovePropaguleBlock\@\@UEBAHAEBVBlock\@\@\@Z + */ + virtual int getVariant(class Block const &) const; + /** + * @vftbl 151 + * @symbol ?init\@MangrovePropaguleBlock\@\@UEAAAEAVBlockLegacy\@\@XZ + */ + virtual class BlockLegacy & init(); + /** + * @vftbl 155 + * @symbol __unk_vfn_155 + */ + virtual void __unk_vfn_155(); + /** + * @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 171 + * @symbol ?randomTick\@MangrovePropaguleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + */ + virtual void randomTick(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 178 + * @symbol ?canSurvive\@MangrovePropaguleBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; + /** + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@MangrovePropaguleBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + */ + virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + /** + * @vftbl 189 + * @symbol ?getResourceCount\@MangrovePropaguleBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + */ + virtual int getResourceCount(class Randomize &, class Block const &, int) const; + /** + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@MangrovePropaguleBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + */ + virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MANGROVEPROPAGULEBLOCK + /** + * @symbol ?waterSpreadCausesSpawn\@MangrovePropaguleBlock\@\@UEBA_NXZ + */ + MCVAPI bool waterSpreadCausesSpawn() const; +#endif + /** + * @symbol ??0MangrovePropaguleBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + */ + MCAPI MangrovePropaguleBlock(std::string const &, int); + +//private: + /** + * @symbol ?_growTree\@MangrovePropaguleBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + */ + MCAPI bool _growTree(class BlockSource &, class BlockPos const &, class Random &) const; + /** + * @symbol ?_isFullyGrown\@MangrovePropaguleBlock\@\@AEBA_NAEBVBlock\@\@\@Z + */ + MCAPI bool _isFullyGrown(class Block const &) const; + /** + * @symbol ?_isHanging\@MangrovePropaguleBlock\@\@AEBA_NAEBVBlock\@\@\@Z + */ + MCAPI bool _isHanging(class Block const &) const; + +private: + +}; diff --git a/LiteLoader/include/llapi/mc/MangroveRootBlock.hpp b/LiteLoader/include/llapi/mc/MangroveRootsBlock.hpp similarity index 52% rename from LiteLoader/include/llapi/mc/MangroveRootBlock.hpp rename to LiteLoader/include/llapi/mc/MangroveRootsBlock.hpp index 7db4907607..faedd38680 100644 --- a/LiteLoader/include/llapi/mc/MangroveRootBlock.hpp +++ b/LiteLoader/include/llapi/mc/MangroveRootsBlock.hpp @@ -1,5 +1,5 @@ /** - * @file MangroveRootBlock.hpp + * @file MangroveRootsBlock.hpp * */ #pragma once @@ -11,20 +11,17 @@ #undef BEFORE_EXTRA -/** - * @brief MC class MangroveRootBlock. - * - */ -class MangroveRootBlock : public BlockLegacy { + +class MangroveRootsBlock : public BlockLegacy { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_MANGROVEROOTBLOCK +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_MANGROVEROOTSBLOCK public: - class MangroveRootBlock& operator=(class MangroveRootBlock const &) = delete; - MangroveRootBlock(class MangroveRootBlock const &) = delete; - MangroveRootBlock() = delete; + class MangroveRootsBlock& operator=(class MangroveRootsBlock const &) = delete; + MangroveRootsBlock(class MangroveRootsBlock const &) = delete; + MangroveRootsBlock() = delete; #endif public: @@ -40,19 +37,24 @@ class MangroveRootBlock : public BlockLegacy { virtual void __unk_vfn_19(); /** * @vftbl 25 - * @symbol ?canConnect\@MangroveRootBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z + * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -64,10 +66,10 @@ class MangroveRootBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -99,10 +101,10 @@ class MangroveRootBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -129,15 +131,15 @@ class MangroveRootBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -145,97 +147,92 @@ class MangroveRootBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 + * @symbol ?canContainLiquid\@MangroveRootsBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_61(); + virtual bool canContainLiquid() const; /** - * @vftbl 62 - * @symbol ?canContainLiquid\@MangroveRootBlock\@\@UEBA_NXZ + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual bool canContainLiquid() const; + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @symbol ??0MangroveRootBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0MangroveRootsBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ - MCAPI MangroveRootBlock(std::string const &, int, class Material const &); + MCAPI MangroveRootsBlock(std::string const &, int, class Material const &); }; diff --git a/LiteLoader/include/llapi/mc/MapCloningRecipe.hpp b/LiteLoader/include/llapi/mc/MapCloningRecipe.hpp index a816c2e2bb..f998540352 100644 --- a/LiteLoader/include/llapi/mc/MapCloningRecipe.hpp +++ b/LiteLoader/include/llapi/mc/MapCloningRecipe.hpp @@ -37,9 +37,9 @@ class MapCloningRecipe : public Recipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@MapCloningRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z + * @symbol ?assemble\@MapCloningRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEAVCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; + virtual std::vector const & assemble(class CraftingContainer &, class CraftingContext &) const; /** * @vftbl 2 * @symbol ?getCraftingSize\@MapCloningRecipe\@\@UEBAHXZ @@ -62,9 +62,9 @@ class MapCloningRecipe : public Recipe { virtual void __unk_vfn_5(); /** * @vftbl 6 - * @symbol ?matches\@MapCloningRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @symbol ?matches\@MapCloningRecipe\@\@UEBA_NAEBVCraftingContainer\@\@AEBVCraftingContext\@\@\@Z */ - virtual bool matches(class CraftingContainer &, class Level &) const; + virtual bool matches(class CraftingContainer const &, class CraftingContext const &) const; /** * @vftbl 7 * @symbol ?size\@MapCloningRecipe\@\@UEBAHXZ diff --git a/LiteLoader/include/llapi/mc/MapCreateLockedCopyPacket.hpp b/LiteLoader/include/llapi/mc/MapCreateLockedCopyPacket.hpp index 723c4d4f89..143a9866a3 100644 --- a/LiteLoader/include/llapi/mc/MapCreateLockedCopyPacket.hpp +++ b/LiteLoader/include/llapi/mc/MapCreateLockedCopyPacket.hpp @@ -51,9 +51,9 @@ class MapCreateLockedCopyPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@MapCreateLockedCopyPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@MapCreateLockedCopyPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MAPCREATELOCKEDCOPYPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/MapExtendingRecipe.hpp b/LiteLoader/include/llapi/mc/MapExtendingRecipe.hpp index 4cc67565a0..f34ef69e55 100644 --- a/LiteLoader/include/llapi/mc/MapExtendingRecipe.hpp +++ b/LiteLoader/include/llapi/mc/MapExtendingRecipe.hpp @@ -37,9 +37,9 @@ class MapExtendingRecipe : public Recipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@MapExtendingRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z + * @symbol ?assemble\@MapExtendingRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEAVCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; + virtual std::vector const & assemble(class CraftingContainer &, class CraftingContext &) const; /** * @vftbl 2 * @symbol ?getCraftingSize\@MapExtendingRecipe\@\@UEBAHXZ @@ -62,9 +62,9 @@ class MapExtendingRecipe : public Recipe { virtual void __unk_vfn_5(); /** * @vftbl 6 - * @symbol ?matches\@MapExtendingRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @symbol ?matches\@MapExtendingRecipe\@\@UEBA_NAEBVCraftingContainer\@\@AEBVCraftingContext\@\@\@Z */ - virtual bool matches(class CraftingContainer &, class Level &) const; + virtual bool matches(class CraftingContainer const &, class CraftingContext const &) const; /** * @vftbl 7 * @symbol ?size\@MapExtendingRecipe\@\@UEBAHXZ @@ -83,12 +83,4 @@ class MapExtendingRecipe : public Recipe { */ MCAPI static class mce::UUID const CraftingTableID; -//private: - /** - * @symbol ?_updateMapInstance\@MapExtendingRecipe\@\@AEBAXAEAVItemInstance\@\@\@Z - */ - MCAPI void _updateMapInstance(class ItemInstance &) const; - -private: - }; diff --git a/LiteLoader/include/llapi/mc/MapInfoRequestPacket.hpp b/LiteLoader/include/llapi/mc/MapInfoRequestPacket.hpp index 969616664d..524ccd1baf 100644 --- a/LiteLoader/include/llapi/mc/MapInfoRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/MapInfoRequestPacket.hpp @@ -51,9 +51,9 @@ class MapInfoRequestPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@MapInfoRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@MapInfoRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 8989be3dec..8ec3a44199 100644 --- a/LiteLoader/include/llapi/mc/MapItem.hpp +++ b/LiteLoader/include/llapi/mc/MapItem.hpp @@ -37,11 +37,6 @@ class MapItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -57,6 +52,11 @@ class MapItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -129,21 +129,31 @@ class MapItem : public Item { virtual void fixupCommon(class ItemStackBase &, class Level &) const; /** * @vftbl 115 - * @symbol ?isSameItem\@MapItem\@\@UEBA_NAEBVItemStackBase\@\@0\@Z + * @symbol __unk_vfn_115 */ - virtual bool isSameItem(class ItemStackBase const &, class ItemStackBase const &) const; + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); /** * @vftbl 117 + * @symbol ?hasSameRelevantUserData\@MapItem\@\@UEBA_NAEBVItemStackBase\@\@0\@Z + */ + virtual bool hasSameRelevantUserData(class ItemStackBase const &, class ItemStackBase const &) const; + /** + * @vftbl 119 * @symbol ?setIconInfo\@MapItem\@\@UEAAAEAVItem\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ virtual class Item & setIconInfo(std::string const &, int); /** - * @vftbl 118 + * @vftbl 120 * @symbol ?getIconInfo\@MapItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 133 + * @vftbl 135 * @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/MapItemSavedData.hpp b/LiteLoader/include/llapi/mc/MapItemSavedData.hpp index b1557f2955..03ed10191f 100644 --- a/LiteLoader/include/llapi/mc/MapItemSavedData.hpp +++ b/LiteLoader/include/llapi/mc/MapItemSavedData.hpp @@ -41,14 +41,14 @@ struct ChunkBounds { * @symbol ??0MapItemSavedData\@\@QEAA\@UActorUniqueID\@\@_N\@Z */ MCAPI MapItemSavedData(struct ActorUniqueID, bool); - /** - * @symbol ?addTrackedMapEntity\@MapItemSavedData\@\@QEAA?AV?$shared_ptr\@VMapItemTrackedActor\@\@\@std\@\@AEAVActor\@\@W4Type\@MapDecoration\@\@\@Z - */ - MCAPI class std::shared_ptr addTrackedMapEntity(class Actor &, enum class MapDecoration::Type); /** * @symbol ?addTrackedMapEntity\@MapItemSavedData\@\@QEAA?AV?$shared_ptr\@VMapItemTrackedActor\@\@\@std\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@W4Type\@MapDecoration\@\@\@Z */ MCAPI class std::shared_ptr addTrackedMapEntity(class BlockPos const &, class BlockSource &, enum class MapDecoration::Type); + /** + * @symbol ?addTrackedMapEntity\@MapItemSavedData\@\@QEAA?AV?$shared_ptr\@VMapItemTrackedActor\@\@\@std\@\@AEAVActor\@\@W4Type\@MapDecoration\@\@\@Z + */ + MCAPI class std::shared_ptr addTrackedMapEntity(class Actor &, enum class MapDecoration::Type); /** * @symbol ?areClientPixelsDirty\@MapItemSavedData\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/MapLockingRecipe.hpp b/LiteLoader/include/llapi/mc/MapLockingRecipe.hpp index 4db3b151da..b96fd2d738 100644 --- a/LiteLoader/include/llapi/mc/MapLockingRecipe.hpp +++ b/LiteLoader/include/llapi/mc/MapLockingRecipe.hpp @@ -37,9 +37,9 @@ class MapLockingRecipe : public Recipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@MapLockingRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z + * @symbol ?assemble\@MapLockingRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEAVCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; + virtual std::vector const & assemble(class CraftingContainer &, class CraftingContext &) const; /** * @vftbl 2 * @symbol ?getCraftingSize\@MapLockingRecipe\@\@UEBAHXZ @@ -62,9 +62,9 @@ class MapLockingRecipe : public Recipe { virtual void __unk_vfn_5(); /** * @vftbl 6 - * @symbol ?matches\@MapLockingRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @symbol ?matches\@MapLockingRecipe\@\@UEBA_NAEBVCraftingContainer\@\@AEBVCraftingContext\@\@\@Z */ - virtual bool matches(class CraftingContainer &, class Level &) const; + virtual bool matches(class CraftingContainer const &, class CraftingContext const &) const; /** * @vftbl 7 * @symbol ?size\@MapLockingRecipe\@\@UEBAHXZ diff --git a/LiteLoader/include/llapi/mc/MapUpgradingRecipe.hpp b/LiteLoader/include/llapi/mc/MapUpgradingRecipe.hpp index 8f0150f1c9..3100d684ec 100644 --- a/LiteLoader/include/llapi/mc/MapUpgradingRecipe.hpp +++ b/LiteLoader/include/llapi/mc/MapUpgradingRecipe.hpp @@ -37,9 +37,9 @@ class MapUpgradingRecipe : public Recipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@MapUpgradingRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z + * @symbol ?assemble\@MapUpgradingRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEAVCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; + virtual std::vector const & assemble(class CraftingContainer &, class CraftingContext &) const; /** * @vftbl 2 * @symbol ?getCraftingSize\@MapUpgradingRecipe\@\@UEBAHXZ @@ -62,9 +62,9 @@ class MapUpgradingRecipe : public Recipe { virtual void __unk_vfn_5(); /** * @vftbl 6 - * @symbol ?matches\@MapUpgradingRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @symbol ?matches\@MapUpgradingRecipe\@\@UEBA_NAEBVCraftingContainer\@\@AEBVCraftingContext\@\@\@Z */ - virtual bool matches(class CraftingContainer &, class Level &) const; + virtual bool matches(class CraftingContainer const &, class CraftingContext const &) const; /** * @vftbl 7 * @symbol ?size\@MapUpgradingRecipe\@\@UEBAHXZ diff --git a/LiteLoader/include/llapi/mc/MedicineItem.hpp b/LiteLoader/include/llapi/mc/MedicineItem.hpp index 44d80bc4c3..0843421f2a 100644 --- a/LiteLoader/include/llapi/mc/MedicineItem.hpp +++ b/LiteLoader/include/llapi/mc/MedicineItem.hpp @@ -36,11 +36,6 @@ class MedicineItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class MedicineItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -122,12 +122,22 @@ class MedicineItem : public Item { */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 117 + * @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\@MedicineItem\@\@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 118 + * @vftbl 120 * @symbol ?getIconInfo\@MedicineItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; diff --git a/LiteLoader/include/llapi/mc/MelonBlock.hpp b/LiteLoader/include/llapi/mc/MelonBlock.hpp index 3df1130923..ca5b3878ae 100644 --- a/LiteLoader/include/llapi/mc/MelonBlock.hpp +++ b/LiteLoader/include/llapi/mc/MelonBlock.hpp @@ -45,16 +45,21 @@ class MelonBlock : public BlockLegacy { * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class MelonBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class MelonBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,112 +136,107 @@ class MelonBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@MelonBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @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 b4cfb3171d..53276f2b25 100644 --- a/LiteLoader/include/llapi/mc/MerchantRecipe.hpp +++ b/LiteLoader/include/llapi/mc/MerchantRecipe.hpp @@ -51,14 +51,14 @@ class MerchantRecipe { * @symbol ??0MerchantRecipe\@\@QEAA\@AEBVItemInstance\@\@00\@Z */ MCAPI MerchantRecipe(class ItemInstance const &, class ItemInstance const &, class ItemInstance const &); - /** - * @symbol ??0MerchantRecipe\@\@QEAA\@AEBVItemInstance\@\@0\@Z - */ - MCAPI MerchantRecipe(class ItemInstance const &, class ItemInstance const &); /** * @symbol ??0MerchantRecipe\@\@QEAA\@AEBV0\@\@Z */ MCAPI MerchantRecipe(class MerchantRecipe const &); + /** + * @symbol ??0MerchantRecipe\@\@QEAA\@AEBVItemInstance\@\@0\@Z + */ + MCAPI MerchantRecipe(class ItemInstance const &, class ItemInstance const &); /** * @symbol ?calculateDemandPrices\@MerchantRecipe\@\@QEAAXHHH_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/MessagingCommand.hpp b/LiteLoader/include/llapi/mc/MessagingCommand.hpp index 168f0bfd39..8f644b6879 100644 --- a/LiteLoader/include/llapi/mc/MessagingCommand.hpp +++ b/LiteLoader/include/llapi/mc/MessagingCommand.hpp @@ -52,13 +52,13 @@ class MessagingCommand : public Command { */ MCAPI bool checkChatPermissions(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?checkMutedAndSendToastIfMuted\@MessagingCommand\@\@KAXAEBVPlayer\@\@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 + * @symbol ?checkMutedAndSendToastIfMuted\@MessagingCommand\@\@KAXAEBUCommandOriginIdentity\@\@AEBVLevel\@\@AEBV?$vector\@W4TextFilteringEvent\@Safety\@\@V?$allocator\@W4TextFilteringEvent\@Safety\@\@\@std\@\@\@std\@\@\@Z */ - MCAPI static void checkMutedAndSendToastIfMuted(class Player const &, std::vector const &); + MCAPI static void checkMutedAndSendToastIfMuted(struct CommandOriginIdentity const &, class Level const &, std::vector const &); /** - * @symbol ?checkMutedAndSendToastIfMuted\@MessagingCommand\@\@KAXAEBUCommandOriginIdentity\@\@AEBVLevel\@\@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 + * @symbol ?checkMutedAndSendToastIfMuted\@MessagingCommand\@\@KAXAEBVPlayer\@\@AEBV?$vector\@W4TextFilteringEvent\@Safety\@\@V?$allocator\@W4TextFilteringEvent\@Safety\@\@\@std\@\@\@std\@\@\@Z */ - MCAPI static void checkMutedAndSendToastIfMuted(struct CommandOriginIdentity const &, class Level const &, std::vector const &); + MCAPI static void checkMutedAndSendToastIfMuted(class Player const &, std::vector const &); protected: diff --git a/LiteLoader/include/llapi/mc/MetalBlock.hpp b/LiteLoader/include/llapi/mc/MetalBlock.hpp index e5120f5c29..3a3b90aa51 100644 --- a/LiteLoader/include/llapi/mc/MetalBlock.hpp +++ b/LiteLoader/include/llapi/mc/MetalBlock.hpp @@ -40,16 +40,21 @@ class MetalBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class MetalBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class MetalBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,105 +131,100 @@ class MetalBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 ea31dfa381..739a590568 100644 --- a/LiteLoader/include/llapi/mc/Minecart.hpp +++ b/LiteLoader/include/llapi/mc/Minecart.hpp @@ -46,202 +46,197 @@ class Minecart : public Actor { */ virtual void __unk_vfn_16(); /** - * @vftbl 33 + * @vftbl 32 * @symbol ?getInterpolatedBodyYaw\@Minecart\@\@UEBAMM\@Z */ virtual float getInterpolatedBodyYaw(float) const; /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 79 + * @vftbl 77 * @symbol ?getShadowHeightOffs\@Minecart\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 80 + * @vftbl 78 * @symbol ?getShadowRadius\@Minecart\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_80(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_86(); /** - * @vftbl 95 + * @vftbl 93 * @symbol ?isPickable\@Minecart\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 + */ + virtual void __unk_vfn_94(); + /** + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 134 + * @vftbl 132 * @symbol ?isInvulnerableTo\@Minecart\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 139 + * @vftbl 137 * @symbol ?onBounceStarted\@Minecart\@\@UEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void onBounceStarted(class BlockPos const &, class Block const &); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?getControllingPlayer\@Minecart\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getControllingPlayer() const; /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 244 + * @vftbl 236 * @symbol ?kill\@Minecart\@\@MEAAXXZ */ virtual void kill(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@Minecart\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@Minecart\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@Minecart\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 274 + * @vftbl 266 * @symbol ?_onSizeUpdated\@Minecart\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 276 + * @vftbl 268 * @symbol ?destroy\@Minecart\@\@UEAAXAEBVActorDamageSource\@\@_N\@Z */ virtual void destroy(class ActorDamageSource const &, bool); /** - * @vftbl 277 - * @symbol ?getType\@MinecartHopper\@\@UEAA?AW4MinecartType\@\@XZ + * @vftbl 269 + * @symbol ?getType\@MinecartTNT\@\@UEAA?AW4MinecartType\@\@XZ */ virtual enum class MinecartType getType() = 0; /** - * @vftbl 278 + * @vftbl 270 * @symbol ?getDefaultDisplayBlock\@Minecart\@\@UEBAPEBVBlock\@\@XZ */ virtual class Block const * getDefaultDisplayBlock() const; /** - * @vftbl 279 - * @symbol __unk_vfn_279 + * @vftbl 271 + * @symbol __unk_vfn_271 */ - virtual void __unk_vfn_279(); + virtual void __unk_vfn_271(); /** - * @vftbl 280 + * @vftbl 272 * @symbol ?getDefaultDisplayOffset\@Minecart\@\@UEBAHXZ */ virtual int getDefaultDisplayOffset() const; /** - * @vftbl 281 + * @vftbl 273 * @symbol ?applyNaturalSlowdown\@Minecart\@\@MEAAXAEAVBlockSource\@\@\@Z */ virtual void applyNaturalSlowdown(class BlockSource &); /** - * @vftbl 282 + * @vftbl 274 * @symbol ?_lazyInitDisplayBlock\@Minecart\@\@EEAAXXZ */ virtual void _lazyInitDisplayBlock(); diff --git a/LiteLoader/include/llapi/mc/MinecartChest.hpp b/LiteLoader/include/llapi/mc/MinecartChest.hpp index a0614cfc8d..4d8601b680 100644 --- a/LiteLoader/include/llapi/mc/MinecartChest.hpp +++ b/LiteLoader/include/llapi/mc/MinecartChest.hpp @@ -37,132 +37,127 @@ class MinecartChest : public Minecart { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); - /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 276 + * @vftbl 268 * @symbol ?destroy\@MinecartChest\@\@UEAAXAEBVActorDamageSource\@\@_N\@Z */ virtual void destroy(class ActorDamageSource const &, bool); /** - * @vftbl 277 + * @vftbl 269 * @symbol ?getType\@MinecartChest\@\@UEAA?AW4MinecartType\@\@XZ */ virtual enum class MinecartType getType(); /** - * @vftbl 278 + * @vftbl 270 * @symbol ?getDefaultDisplayBlock\@MinecartChest\@\@UEBAPEBVBlock\@\@XZ */ virtual class Block const * getDefaultDisplayBlock() const; /** - * @vftbl 279 - * @symbol __unk_vfn_279 + * @vftbl 271 + * @symbol __unk_vfn_271 */ - virtual void __unk_vfn_279(); + virtual void __unk_vfn_271(); /** - * @vftbl 281 + * @vftbl 273 * @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 731a1f389d..1bf055ce64 100644 --- a/LiteLoader/include/llapi/mc/MinecartCommandBlock.hpp +++ b/LiteLoader/include/llapi/mc/MinecartCommandBlock.hpp @@ -42,147 +42,142 @@ class MinecartCommandBlock : public Minecart { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 61 + * @vftbl 60 * @symbol ?canShowNameTag\@MinecartCommandBlock\@\@UEBA_NXZ */ virtual bool canShowNameTag() const; /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 - */ - virtual void __unk_vfn_243(); - /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@MinecartCommandBlock\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@MinecartCommandBlock\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 277 + * @vftbl 269 * @symbol ?getType\@MinecartCommandBlock\@\@UEAA?AW4MinecartType\@\@XZ */ virtual enum class MinecartType getType(); /** - * @vftbl 278 + * @vftbl 270 * @symbol ?getDefaultDisplayBlock\@MinecartCommandBlock\@\@UEBAPEBVBlock\@\@XZ */ virtual class Block const * getDefaultDisplayBlock() const; /** - * @vftbl 279 - * @symbol __unk_vfn_279 + * @vftbl 271 + * @symbol __unk_vfn_271 */ - virtual void __unk_vfn_279(); + virtual void __unk_vfn_271(); /** - * @vftbl 281 + * @vftbl 273 * @symbol ?applyNaturalSlowdown\@MinecartCommandBlock\@\@MEAAXAEAVBlockSource\@\@\@Z */ virtual void applyNaturalSlowdown(class BlockSource &); /** - * @vftbl 282 + * @vftbl 274 * @symbol ?_lazyInitDisplayBlock\@MinecartCommandBlock\@\@EEAAXXZ */ virtual void _lazyInitDisplayBlock(); diff --git a/LiteLoader/include/llapi/mc/MinecartHopper.hpp b/LiteLoader/include/llapi/mc/MinecartHopper.hpp index 7f1b899a19..5458c3be91 100644 --- a/LiteLoader/include/llapi/mc/MinecartHopper.hpp +++ b/LiteLoader/include/llapi/mc/MinecartHopper.hpp @@ -37,137 +37,132 @@ class MinecartHopper : public Minecart { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); - /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 276 + * @vftbl 268 * @symbol ?destroy\@MinecartHopper\@\@UEAAXAEBVActorDamageSource\@\@_N\@Z */ virtual void destroy(class ActorDamageSource const &, bool); /** - * @vftbl 277 + * @vftbl 269 * @symbol ?getType\@MinecartHopper\@\@UEAA?AW4MinecartType\@\@XZ */ virtual enum class MinecartType getType(); /** - * @vftbl 278 + * @vftbl 270 * @symbol ?getDefaultDisplayBlock\@MinecartHopper\@\@UEBAPEBVBlock\@\@XZ */ virtual class Block const * getDefaultDisplayBlock() const; /** - * @vftbl 279 - * @symbol __unk_vfn_279 + * @vftbl 271 + * @symbol __unk_vfn_271 */ - virtual void __unk_vfn_279(); + virtual void __unk_vfn_271(); /** - * @vftbl 280 + * @vftbl 272 * @symbol ?getDefaultDisplayOffset\@MinecartHopper\@\@UEBAHXZ */ virtual int getDefaultDisplayOffset() const; /** - * @vftbl 281 + * @vftbl 273 * @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 a52696839f..415d112668 100644 --- a/LiteLoader/include/llapi/mc/MinecartItem.hpp +++ b/LiteLoader/include/llapi/mc/MinecartItem.hpp @@ -36,11 +36,6 @@ class MinecartItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class MinecartItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -112,7 +112,17 @@ class MinecartItem : public Item { */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 132 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 134 * @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/MinecartRideable.hpp b/LiteLoader/include/llapi/mc/MinecartRideable.hpp index f4b6d75852..980cd62bdf 100644 --- a/LiteLoader/include/llapi/mc/MinecartRideable.hpp +++ b/LiteLoader/include/llapi/mc/MinecartRideable.hpp @@ -37,120 +37,115 @@ class MinecartRideable : public Minecart { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_267(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 - */ - virtual void __unk_vfn_275(); - /** - * @vftbl 277 + * @vftbl 269 * @symbol ?getType\@MinecartRideable\@\@UEAA?AW4MinecartType\@\@XZ */ virtual enum class MinecartType getType(); /** - * @vftbl 279 - * @symbol __unk_vfn_279 + * @vftbl 271 + * @symbol __unk_vfn_271 */ - virtual void __unk_vfn_279(); + virtual void __unk_vfn_271(); /** * @symbol ??0MinecartRideable\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MinecartTNT.hpp b/LiteLoader/include/llapi/mc/MinecartTNT.hpp index e100fd129f..75a52ad8f4 100644 --- a/LiteLoader/include/llapi/mc/MinecartTNT.hpp +++ b/LiteLoader/include/llapi/mc/MinecartTNT.hpp @@ -37,150 +37,145 @@ class MinecartTNT : public Minecart { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@MinecartTNT\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 141 + * @vftbl 139 * @symbol ?handleEntityEvent\@MinecartTNT\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 182 + * @vftbl 180 * @symbol ?causeFallDamage\@MinecartTNT\@\@MEAAXMMVActorDamageSource\@\@\@Z */ virtual void causeFallDamage(float, float, class ActorDamageSource); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@MinecartTNT\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 276 + * @vftbl 268 * @symbol ?destroy\@MinecartTNT\@\@UEAAXAEBVActorDamageSource\@\@_N\@Z */ virtual void destroy(class ActorDamageSource const &, bool); /** - * @vftbl 277 + * @vftbl 269 * @symbol ?getType\@MinecartTNT\@\@UEAA?AW4MinecartType\@\@XZ */ virtual enum class MinecartType getType(); /** - * @vftbl 278 + * @vftbl 270 * @symbol ?getDefaultDisplayBlock\@MinecartTNT\@\@UEBAPEBVBlock\@\@XZ */ virtual class Block const * getDefaultDisplayBlock() const; /** - * @vftbl 279 - * @symbol __unk_vfn_279 + * @vftbl 271 + * @symbol __unk_vfn_271 */ - virtual void __unk_vfn_279(); + virtual void __unk_vfn_271(); /** * @symbol ??0MinecartTNT\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/Minecraft.hpp b/LiteLoader/include/llapi/mc/Minecraft.hpp index 06fa9d721a..7b770004e6 100644 --- a/LiteLoader/include/llapi/mc/Minecraft.hpp +++ b/LiteLoader/include/llapi/mc/Minecraft.hpp @@ -96,6 +96,10 @@ class Minecraft { * @symbol ?disconnectClient\@Minecraft\@\@QEAAXAEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void disconnectClient(class NetworkIdentifier const &, std::string const &); + /** + * @symbol ?earlyShutdownMainthread\@Minecraft\@\@QEAAXXZ + */ + MCAPI void earlyShutdownMainthread(); /** * @symbol ?getCommands\@Minecraft\@\@QEAAAEAVMinecraftCommands\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/MinecraftCommands.hpp b/LiteLoader/include/llapi/mc/MinecraftCommands.hpp index 29b0822e3a..00509d35ce 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\@\@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 ?runOrDeferCommand\@MinecraftCommands\@\@QEAAXAEBVHashedString\@\@AEAVCommandOrigin\@\@W4CurrentCmdVersion\@\@\@Z + */ + MCAPI void runOrDeferCommand(class HashedString const &, 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 168b6c748b..fd1e1fe6c3 100644 --- a/LiteLoader/include/llapi/mc/MinecraftEventing.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftEventing.hpp @@ -327,6 +327,10 @@ enum class AcquisitionMethod; * @symbol ?fireEventEmptyLibraryCategoryError\@MinecraftEventing\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireEventEmptyLibraryCategoryError(std::string const &) const; + /** + * @symbol ?fireEventEntitlementCacheLoadTimeout\@MinecraftEventing\@\@UEAAXXZ + */ + MCVAPI void fireEventEntitlementCacheLoadTimeout(); /** * @symbol ?fireEventEntitlementListInfo\@MinecraftEventing\@\@UEAAXAEAV?$vector\@VContentIdentity\@\@V?$allocator\@VContentIdentity\@\@\@std\@\@\@std\@\@_N\@Z */ @@ -336,17 +340,21 @@ enum class AcquisitionMethod; */ MCVAPI void fireEventEntitySpawned(class Player *, int, unsigned int); /** - * @symbol ?fireEventGameRulesUpdated\@MinecraftEventing\@\@UEAAX_N0AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventFeedbackSubmitted\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N1\@Z */ - MCVAPI void fireEventGameRulesUpdated(bool, bool, std::string const &); + 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 + * @symbol ?fireEventGameRulesUpdated\@MinecraftEventing\@\@UEAAX_N0AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCVAPI void fireEventGameRulesUpdated(float, float, std::string const &); + MCVAPI void fireEventGameRulesUpdated(bool, bool, std::string const &); /** * @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 */ @@ -491,6 +499,10 @@ enum class AcquisitionMethod; * @symbol ?fireEventPackHashChanged\@MinecraftEventing\@\@UEAAXAEBVPackManifest\@\@\@Z */ MCVAPI void fireEventPackHashChanged(class PackManifest const &); + /** + * @symbol ?fireEventPackImportTimeout\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCVAPI void fireEventPackImportTimeout(std::string const &); /** * @symbol ?fireEventPackPlayed\@MinecraftEventing\@\@UEAAXAEBVPackInstance\@\@I\@Z */ @@ -532,9 +544,9 @@ enum class AcquisitionMethod; */ MCVAPI void fireEventPersonaEmotePlayed(std::string const &, bool, int); /** - * @symbol ?fireEventPersonaGeneralError\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventPersonaGeneralError\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@I\@Z */ - MCVAPI void fireEventPersonaGeneralError(std::string const &); + MCVAPI void fireEventPersonaGeneralError(std::string const &, unsigned int); /** * @symbol ?fireEventPersonaInitalizationEvent\@MinecraftEventing\@\@UEAAXIAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ @@ -563,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 ?fireEventPlayerAttemptingExploit\@MinecraftEventing\@\@UEAAXPEAVPlayer\@\@W4ExploitType\@IMinecraftEventing\@\@\@Z + */ + MCVAPI void fireEventPlayerAttemptingExploit(class Player *, enum class IMinecraftEventing::ExploitType); /** * @symbol ?fireEventPlayerBanned\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ @@ -576,13 +592,13 @@ enum class AcquisitionMethod; */ MCVAPI void fireEventPlayerDamaged(class Player *, enum class ActorDamageCause); /** - * @symbol ?fireEventPlayerJoinWorld\@MinecraftEventing\@\@UEAAXAEBIW4SubClientId\@\@W4PlayerJoinWorldAttemptState\@IConnectionEventing\@\@HW4DisconnectFailReason\@Connection\@\@W4TransportLayer\@\@\@Z + * @symbol ?fireEventPlayerJoinWorld\@MinecraftEventing\@\@UEAAXAEBIW4SubClientId\@\@_NW4PlayerJoinWorldAttemptState\@IConnectionEventing\@\@HW4DisconnectFailReason\@Connection\@\@W4TransportLayer\@\@\@Z */ - MCVAPI void fireEventPlayerJoinWorld(unsigned int const &, enum class SubClientId, enum class IConnectionEventing::PlayerJoinWorldAttemptState, int, enum class Connection::DisconnectFailReason, enum class TransportLayer); + 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\@\@W4PlayerJoinWorldAttemptState\@IConnectionEventing\@\@HW4TransportLayer\@\@\@Z + * @symbol ?fireEventPlayerJoinWorld\@MinecraftEventing\@\@UEAAXAEBIW4SubClientId\@\@_NW4PlayerJoinWorldAttemptState\@IConnectionEventing\@\@HW4TransportLayer\@\@\@Z */ - MCVAPI void fireEventPlayerJoinWorld(unsigned int const &, enum class SubClientId, enum class IConnectionEventing::PlayerJoinWorldAttemptState, int, enum class TransportLayer); + MCVAPI void fireEventPlayerJoinWorld(unsigned int const &, enum class SubClientId, bool, enum class IConnectionEventing::PlayerJoinWorldAttemptState, int, enum class TransportLayer); /** * @symbol ?fireEventPlayerKicked\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ @@ -788,9 +804,9 @@ enum class AcquisitionMethod; */ MCVAPI void fireEventSignInEdu(std::string const &, enum class ADRole, enum class IMinecraftEventing::EduSignInStage, std::string const &, std::string const &, std::vector> const &); /** - * @symbol ?fireEventSignInToIdentity\@MinecraftEventing\@\@UEAAXW4SignInAccountType\@IMinecraftEventing\@\@W4SignInTrigger\@3\@_NW4SignInStage\@3\@W4SignInResult\@Social\@\@UPlayerIDs\@7\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @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, struct Social::PlayerIDs, std::string const &); + 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 */ @@ -1350,10 +1366,18 @@ enum class AcquisitionMethod; * @symbol ?_generateWorldSessionId\@MinecraftEventing\@\@AEAAXXZ */ MCAPI void _generateWorldSessionId(); + /** + * @symbol ?_sendTelemetryHeartbeat\@MinecraftEventing\@\@AEAAXPEBD\@Z + */ + MCAPI void _sendTelemetryHeartbeat(char const *); /** * @symbol ?fireEventPlayerMessage\@MinecraftEventing\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000\@Z */ MCAPI void fireEventPlayerMessage(std::string const &, std::string const &, std::string const &, std::string const &); + /** + * @symbol ?firePlayerTelemetryEvent\@MinecraftEventing\@\@AEAAXAEBVPlayerTelemetry\@Events\@Social\@\@\@Z + */ + MCAPI void firePlayerTelemetryEvent(class Social::Events::PlayerTelemetry const &); private: /** @@ -1364,6 +1388,10 @@ enum class AcquisitionMethod; * @symbol ?mAcquisitionMethodMap\@MinecraftEventing\@\@0V?$unordered_map\@W4ItemAcquisitionMethod\@\@W4AcquisitionMethod\@MinecraftEventing\@\@U?$hash\@W4ItemAcquisitionMethod\@\@\@std\@\@U?$equal_to\@W4ItemAcquisitionMethod\@\@\@5\@V?$allocator\@U?$pair\@$$CBW4ItemAcquisitionMethod\@\@W4AcquisitionMethod\@MinecraftEventing\@\@\@std\@\@\@5\@\@std\@\@B */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> const mAcquisitionMethodMap; + /** + * @symbol ?mPlayerTelemetry\@MinecraftEventing\@\@0V?$unordered_map\@IVPlayerTelemetry\@Events\@Social\@\@U?$hash\@I\@std\@\@U?$equal_to\@I\@5\@V?$allocator\@U?$pair\@$$CBIVPlayerTelemetry\@Events\@Social\@\@\@std\@\@\@5\@\@std\@\@A + */ + MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> mPlayerTelemetry; /** * @symbol ?mUseMethodMap\@MinecraftEventing\@\@0V?$unordered_map\@W4ItemUseMethod\@\@W4UseMethod\@MinecraftEventing\@\@U?$hash\@W4ItemUseMethod\@\@\@std\@\@U?$equal_to\@W4ItemUseMethod\@\@\@5\@V?$allocator\@U?$pair\@$$CBW4ItemUseMethod\@\@W4UseMethod\@MinecraftEventing\@\@\@std\@\@\@5\@\@std\@\@B */ @@ -1376,5 +1404,9 @@ enum class AcquisitionMethod; * @symbol ?sMutex\@MinecraftEventing\@\@0Vmutex\@std\@\@A */ MCAPI static class std::mutex sMutex; + /** + * @symbol ?sPlayerTelemetryMutex\@MinecraftEventing\@\@0Vmutex\@std\@\@A + */ + MCAPI static class std::mutex sPlayerTelemetryMutex; }; diff --git a/LiteLoader/include/llapi/mc/MinecraftGameTest.hpp b/LiteLoader/include/llapi/mc/MinecraftGameTest.hpp index 86336c002c..f817ab0794 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\@\@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 ?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 ?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/MinecraftWorkerPool.hpp b/LiteLoader/include/llapi/mc/MinecraftWorkerPool.hpp index d43a3f1887..024f460f9e 100644 --- a/LiteLoader/include/llapi/mc/MinecraftWorkerPool.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftWorkerPool.hpp @@ -70,6 +70,10 @@ class MinecraftWorkerPool { * @symbol ?RENDERING\@MinecraftWorkerPool\@\@2V?$NonOwnerPointer\@VWorkerPool\@\@\@Bedrock\@\@A */ MCAPI static class Bedrock::NonOwnerPointer RENDERING; + /** + * @symbol ?RENDERING_HELPERS\@MinecraftWorkerPool\@\@2V?$NonOwnerPointer\@VWorkerPool\@\@\@Bedrock\@\@A + */ + MCAPI static class Bedrock::NonOwnerPointer RENDERING_HELPERS; /** * @symbol ?VR\@MinecraftWorkerPool\@\@2V?$NonOwnerPointer\@VWorkerPool\@\@\@Bedrock\@\@A */ diff --git a/LiteLoader/include/llapi/mc/Mob.hpp b/LiteLoader/include/llapi/mc/Mob.hpp index f80ebb3344..8c9936c10e 100644 --- a/LiteLoader/include/llapi/mc/Mob.hpp +++ b/LiteLoader/include/llapi/mc/Mob.hpp @@ -77,732 +77,727 @@ struct JumpPreventionResult { */ virtual void __unk_vfn_16(); /** - * @vftbl 31 + * @vftbl 30 * @symbol ?getInterpolatedBodyRot\@Mob\@\@UEBAMM\@Z */ virtual float getInterpolatedBodyRot(float) const; /** - * @vftbl 32 + * @vftbl 31 * @symbol ?getInterpolatedHeadRot\@Mob\@\@UEBAMM\@Z */ virtual float getInterpolatedHeadRot(float) const; /** - * @vftbl 33 + * @vftbl 32 * @symbol ?getInterpolatedBodyYaw\@Mob\@\@UEBAMM\@Z */ virtual float getInterpolatedBodyYaw(float) const; /** - * @vftbl 34 + * @vftbl 33 * @symbol ?getYawSpeedInDegreesPerSecond\@Mob\@\@UEBAMXZ */ virtual float getYawSpeedInDegreesPerSecond() const; /** - * @vftbl 37 + * @vftbl 36 * @symbol ?resetInterpolated\@Mob\@\@UEAAXXZ */ virtual void resetInterpolated(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 42 + * @vftbl 41 * @symbol ?blockedByShield\@Mob\@\@UEAAXAEBVActorDamageSource\@\@AEAVActor\@\@\@Z */ virtual void blockedByShield(class ActorDamageSource const &, class Actor &); /** - * @vftbl 44 + * @vftbl 43 * @symbol ?teleportTo\@Mob\@\@UEAAXAEBVVec3\@\@_NHH1\@Z */ virtual void teleportTo(class Vec3 const &, bool, int, int, bool); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@Mob\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 50 + * @vftbl 49 * @symbol ?baseTick\@Mob\@\@UEAAXXZ */ virtual void baseTick(); /** - * @vftbl 53 + * @vftbl 52 * @symbol ?startRiding\@Mob\@\@UEAA_NAEAVActor\@\@\@Z */ virtual bool startRiding(class Actor &); /** - * @vftbl 54 + * @vftbl 53 * @symbol ?addPassenger\@Mob\@\@UEAAXAEAVActor\@\@\@Z */ virtual void addPassenger(class Actor &); /** - * @vftbl 62 - * @symbol __unk_vfn_62 - */ - virtual void __unk_vfn_62(); - /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_61(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_68(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_80(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_86(); /** - * @vftbl 92 + * @vftbl 90 * @symbol ?isImmobile\@Mob\@\@UEBA_NXZ */ virtual bool isImmobile() const; /** - * @vftbl 95 + * @vftbl 93 * @symbol ?isPickable\@Mob\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_94(); /** - * @vftbl 97 + * @vftbl 95 * @symbol ?isSleeping\@Mob\@\@UEBA_NXZ */ virtual bool isSleeping() const; /** - * @vftbl 98 + * @vftbl 96 * @symbol ?setSleeping\@Mob\@\@UEAAX_N\@Z */ virtual void setSleeping(bool); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_97(); /** - * @vftbl 101 + * @vftbl 99 * @symbol ?isBlocking\@Mob\@\@UEBA_NXZ */ virtual bool isBlocking() const; /** - * @vftbl 103 + * @vftbl 101 * @symbol ?isAlive\@Mob\@\@UEBA_NXZ */ virtual bool isAlive() const; /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_104(); /** - * @vftbl 107 + * @vftbl 105 * @symbol ?isSurfaceMob\@Mob\@\@UEBA_NXZ */ virtual bool isSurfaceMob() const; /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 106 + * @symbol __unk_vfn_106 + */ + virtual void __unk_vfn_106(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 114 + * @vftbl 112 * @symbol ?setTarget\@Mob\@\@UEAAXPEAVActor\@\@\@Z */ virtual void setTarget(class Actor *); /** - * @vftbl 116 + * @vftbl 114 * @symbol ?attack\@Mob\@\@UEAA_NAEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z */ virtual bool attack(class Actor &, enum class ActorDamageCause const &); /** - * @vftbl 127 + * @vftbl 125 * @symbol ?canPowerJump\@Mob\@\@UEBA_NXZ */ virtual bool canPowerJump() const; /** - * @vftbl 135 + * @vftbl 133 * @symbol ?getBlockDamageCause\@Mob\@\@UEBA?AW4ActorDamageCause\@\@AEBVBlock\@\@\@Z */ virtual enum class ActorDamageCause getBlockDamageCause(class Block const &) const; /** - * @vftbl 136 + * @vftbl 134 * @symbol ?animateHurt\@Mob\@\@UEAAXXZ */ virtual void animateHurt(); /** - * @vftbl 137 + * @vftbl 135 * @symbol ?doFireHurt\@Mob\@\@UEAA_NH\@Z */ virtual bool doFireHurt(int); /** - * @vftbl 141 + * @vftbl 139 * @symbol ?handleEntityEvent\@Mob\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 153 + * @vftbl 151 * @symbol ?getArmorMaterialTypeInSlot\@Mob\@\@UEBA?AW4ArmorMaterialType\@\@W4ArmorSlot\@\@\@Z */ virtual enum class ArmorMaterialType getArmorMaterialTypeInSlot(enum class ArmorSlot) const; /** - * @vftbl 154 + * @vftbl 152 * @symbol ?getArmorMaterialTextureTypeInSlot\@Mob\@\@UEBA?AW4ArmorTextureType\@\@W4ArmorSlot\@\@\@Z */ virtual enum class ArmorTextureType getArmorMaterialTextureTypeInSlot(enum class ArmorSlot) const; /** - * @vftbl 155 + * @vftbl 153 * @symbol ?getArmorColorInSlot\@Mob\@\@UEBAMW4ArmorSlot\@\@H\@Z */ virtual float getArmorColorInSlot(enum class ArmorSlot, int) const; /** - * @vftbl 157 + * @vftbl 155 * @symbol ?setEquippedSlot\@Mob\@\@UEAAXW4EquipmentSlot\@\@AEBVItemStack\@\@\@Z */ virtual void setEquippedSlot(enum class EquipmentSlot, class ItemStack const &); /** - * @vftbl 171 + * @vftbl 169 * @symbol ?canFreeze\@Mob\@\@UEBA_NXZ */ virtual bool canFreeze() const; /** - * @vftbl 177 + * @vftbl 175 * @symbol ?canChangeDimensionsUsingPortal\@Mob\@\@UEBA_NXZ */ virtual bool canChangeDimensionsUsingPortal() const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 182 + * @vftbl 180 * @symbol ?causeFallDamage\@Mob\@\@MEAAXMMVActorDamageSource\@\@\@Z */ virtual void causeFallDamage(float, float, class ActorDamageSource); /** - * @vftbl 190 + * @vftbl 188 * @symbol ?canBePulledIntoVehicle\@Mob\@\@UEBA_NXZ */ virtual bool canBePulledIntoVehicle() const; /** - * @vftbl 191 + * @vftbl 189 * @symbol ?inCaravan\@Mob\@\@UEBA_NXZ */ virtual bool inCaravan() const; /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 196 + * @vftbl 194 * @symbol ?stopRiding\@Mob\@\@UEAAX_N00\@Z */ virtual void stopRiding(bool, bool, bool); /** - * @vftbl 199 + * @vftbl 197 * @symbol ?buildDebugInfo\@Mob\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void buildDebugInfo(std::string &) const; /** - * @vftbl 204 + * @vftbl 202 * @symbol ?getDeathTime\@Mob\@\@UEBAHXZ */ virtual int getDeathTime() const; /** - * @vftbl 215 + * @vftbl 213 * @symbol ?swing\@Mob\@\@UEAAXXZ */ virtual void swing(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 244 + * @vftbl 236 * @symbol ?kill\@Mob\@\@UEAAXXZ */ virtual void kill(); /** - * @vftbl 245 + * @vftbl 237 * @symbol ?die\@Mob\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 246 + * @vftbl 238 * @symbol ?shouldDropDeathLoot\@Mob\@\@UEBA_NXZ */ virtual bool shouldDropDeathLoot() const; /** - * @vftbl 258 + * @vftbl 250 * @symbol ?updateEntitySpecificMolangVariables\@Mob\@\@MEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@Mob\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@Mob\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@Mob\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 266 + * @vftbl 258 * @symbol ?_playStepSound\@Mob\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 273 + * @vftbl 265 * @symbol ?_removePassenger\@Mob\@\@MEAAXAEBUActorUniqueID\@\@_N11\@Z */ virtual void _removePassenger(struct ActorUniqueID const &, bool, bool, bool); /** - * @vftbl 274 + * @vftbl 266 * @symbol ?_onSizeUpdated\@Mob\@\@MEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 276 + * @vftbl 268 * @symbol ?knockback\@Mob\@\@UEAAXPEAVActor\@\@HMMMMM\@Z */ virtual void knockback(class Actor *, int, float, float, float, float, float); /** - * @vftbl 277 + * @vftbl 269 * @symbol ?spawnAnim\@Mob\@\@UEAAXXZ */ virtual void spawnAnim(); /** - * @vftbl 278 + * @vftbl 270 * @symbol ?setSprinting\@Mob\@\@UEAAX_N\@Z */ virtual void setSprinting(bool); /** - * @vftbl 279 + * @vftbl 271 * @symbol ?getHurtSound\@Mob\@\@UEAA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getHurtSound(); /** - * @vftbl 280 + * @vftbl 272 * @symbol ?getDeathSound\@Mob\@\@UEAA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getDeathSound(); /** - * @vftbl 281 + * @vftbl 273 * @symbol ?getSpeed\@Mob\@\@UEBAMXZ */ virtual float getSpeed() const; /** - * @vftbl 282 + * @vftbl 274 * @symbol ?setSpeed\@Mob\@\@UEAAXM\@Z */ virtual void setSpeed(float); /** - * @vftbl 283 + * @vftbl 275 * @symbol ?hurtEffects\@Mob\@\@UEAAXAEBVActorDamageSource\@\@M_N1\@Z */ virtual void hurtEffects(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 284 + * @vftbl 276 * @symbol ?getMeleeWeaponDamageBonus\@Mob\@\@UEAAMPEAV1\@\@Z */ virtual float getMeleeWeaponDamageBonus(class Mob *); /** - * @vftbl 285 + * @vftbl 277 * @symbol ?getMeleeKnockbackBonus\@Mob\@\@UEAAHXZ */ virtual int getMeleeKnockbackBonus(); /** - * @vftbl 286 + * @vftbl 278 * @symbol ?travel\@Mob\@\@UEAAXMMM_N\@Z */ virtual void travel(float, float, float, bool); /** - * @vftbl 287 + * @vftbl 279 * @symbol ?applyFinalFriction\@Mob\@\@UEAAXM_N\@Z */ virtual void applyFinalFriction(float, bool); /** - * @vftbl 288 + * @vftbl 280 * @symbol ?aiStep\@Mob\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 289 + * @vftbl 281 * @symbol ?aiStep\@Mob\@\@UEBAXAEAUIMobMovementProxy\@\@\@Z */ virtual void aiStep(struct IMobMovementProxy &) const; /** - * @vftbl 290 + * @vftbl 282 * @symbol ?pushActors\@Mob\@\@UEAAXXZ */ virtual void pushActors(); /** - * @vftbl 291 + * @vftbl 283 * @symbol ?lookAt\@Mob\@\@UEAAXPEAVActor\@\@MM\@Z */ virtual void lookAt(class Actor *, float, float); /** - * @vftbl 292 + * @vftbl 284 * @symbol ?isLookingAtAnEntity\@Mob\@\@UEAA_NXZ */ virtual bool isLookingAtAnEntity(); /** - * @vftbl 293 + * @vftbl 285 * @symbol ?checkSpawnRules\@Mob\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 294 + * @vftbl 286 * @symbol ?checkSpawnObstruction\@Mob\@\@UEBA_NXZ */ virtual bool checkSpawnObstruction() const; /** - * @vftbl 295 + * @vftbl 287 * @symbol ?getAttackAnim\@Mob\@\@UEAAMM\@Z */ virtual float getAttackAnim(float); /** - * @vftbl 296 + * @vftbl 288 * @symbol ?getItemUseDuration\@Mob\@\@UEBAHXZ */ virtual int getItemUseDuration() const; /** - * @vftbl 297 + * @vftbl 289 * @symbol ?getItemUseStartupProgress\@Mob\@\@UEBAMXZ */ virtual float getItemUseStartupProgress() const; /** - * @vftbl 298 + * @vftbl 290 * @symbol ?getItemUseIntervalProgress\@Mob\@\@UEBAMXZ */ virtual float getItemUseIntervalProgress() const; /** - * @vftbl 299 + * @vftbl 291 * @symbol ?getItemUseIntervalAxis\@Mob\@\@UEBAHXZ */ virtual int getItemUseIntervalAxis() const; /** - * @vftbl 300 + * @vftbl 292 * @symbol ?getTimeAlongSwing\@Mob\@\@UEBAHXZ */ virtual int getTimeAlongSwing() const; /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 302 + * @vftbl 294 * @symbol ?getMaxHeadXRot\@Mob\@\@UEAAMXZ */ virtual float getMaxHeadXRot(); /** - * @vftbl 303 + * @vftbl 295 * @symbol ?isAlliedTo\@Mob\@\@UEAA_NPEAV1\@\@Z */ virtual bool isAlliedTo(class Mob *); /** - * @vftbl 304 + * @vftbl 296 * @symbol ?doHurtTarget\@Mob\@\@UEAA_NPEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z */ virtual bool doHurtTarget(class Actor *, enum class ActorDamageCause const &); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 306 + * @vftbl 298 * @symbol ?leaveCaravan\@Mob\@\@UEAAXXZ */ virtual void leaveCaravan(); /** - * @vftbl 307 + * @vftbl 299 * @symbol ?joinCaravan\@Mob\@\@UEAAXPEAV1\@\@Z */ virtual void joinCaravan(class Mob *); /** - * @vftbl 308 + * @vftbl 300 * @symbol ?hasCaravanTail\@Mob\@\@UEBA_NXZ */ virtual bool hasCaravanTail() const; /** - * @vftbl 309 + * @vftbl 301 * @symbol ?getCaravanHead\@Mob\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getCaravanHead() const; /** - * @vftbl 310 + * @vftbl 302 * @symbol ?getArmorValue\@Mob\@\@UEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 311 + * @vftbl 303 * @symbol ?getArmorCoverPercentage\@Mob\@\@UEBAMXZ */ virtual float getArmorCoverPercentage() const; /** - * @vftbl 312 + * @vftbl 304 * @symbol ?getToughnessValue\@Mob\@\@UEBAHXZ */ virtual int getToughnessValue() const; /** - * @vftbl 313 + * @vftbl 305 * @symbol ?hurtArmorSlots\@Mob\@\@UEAAXAEBVActorDamageSource\@\@HV?$bitset\@$03\@std\@\@\@Z */ virtual void hurtArmorSlots(class ActorDamageSource const &, int, class std::bitset<4>); /** - * @vftbl 314 + * @vftbl 306 * @symbol ?setDamagedArmor\@Mob\@\@UEAAXW4ArmorSlot\@\@AEBVItemStack\@\@\@Z */ virtual void setDamagedArmor(enum class ArmorSlot, class ItemStack const &); /** - * @vftbl 315 + * @vftbl 307 * @symbol ?sendArmorDamage\@Mob\@\@UEAAXV?$bitset\@$03\@std\@\@\@Z */ virtual void sendArmorDamage(class std::bitset<4>); /** - * @vftbl 316 + * @vftbl 308 * @symbol ?sendArmor\@Mob\@\@UEAAXV?$bitset\@$03\@std\@\@\@Z */ virtual void sendArmor(class std::bitset<4>); /** - * @vftbl 317 + * @vftbl 309 * @symbol ?containerChanged\@Mob\@\@UEAAXH\@Z */ virtual void containerChanged(int); /** - * @vftbl 318 + * @vftbl 310 * @symbol ?updateEquipment\@Mob\@\@UEAAXXZ */ virtual void updateEquipment(); /** - * @vftbl 319 + * @vftbl 311 * @symbol ?clearEquipment\@Mob\@\@UEAAHXZ */ virtual int clearEquipment(); /** - * @vftbl 320 + * @vftbl 312 * @symbol ?getAllArmorID\@Mob\@\@UEBA?AV?$vector\@HV?$allocator\@H\@std\@\@\@std\@\@XZ */ virtual std::vector getAllArmorID() const; /** - * @vftbl 321 + * @vftbl 313 * @symbol ?getAllHand\@Mob\@\@UEBA?AV?$vector\@PEBVItemStack\@\@V?$allocator\@PEBVItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getAllHand() const; /** - * @vftbl 322 + * @vftbl 314 * @symbol ?getAllEquipment\@Mob\@\@UEBA?AV?$vector\@PEBVItemStack\@\@V?$allocator\@PEBVItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getAllEquipment() const; /** - * @vftbl 323 + * @vftbl 315 * @symbol ?getArmorTypeHash\@Mob\@\@UEAAHXZ */ virtual int getArmorTypeHash(); /** - * @vftbl 324 + * @vftbl 316 * @symbol ?dropEquipmentOnDeath\@Mob\@\@UEAAXAEBVActorDamageSource\@\@H\@Z */ virtual void dropEquipmentOnDeath(class ActorDamageSource const &, int); /** - * @vftbl 325 + * @vftbl 317 * @symbol ?dropEquipmentOnDeath\@Mob\@\@UEAAXXZ */ virtual void dropEquipmentOnDeath(); /** - * @vftbl 326 + * @vftbl 318 * @symbol ?clearVanishEnchantedItemsOnDeath\@Mob\@\@UEAAXXZ */ virtual void clearVanishEnchantedItemsOnDeath(); /** - * @vftbl 327 + * @vftbl 319 * @symbol ?sendInventory\@Mob\@\@UEAAX_N\@Z */ virtual void sendInventory(bool); /** - * @vftbl 328 + * @vftbl 320 * @symbol ?getDamageAfterEnchantReduction\@Mob\@\@UEBAMAEBVActorDamageSource\@\@M\@Z */ virtual float getDamageAfterEnchantReduction(class ActorDamageSource const &, float) const; /** - * @vftbl 329 + * @vftbl 321 * @symbol ?getDamageAfterArmorReduction\@Mob\@\@UEBAMAEBVActorDamageSource\@\@M\@Z */ virtual float getDamageAfterArmorReduction(class ActorDamageSource const &, float) const; /** - * @vftbl 330 + * @vftbl 322 * @symbol ?getDamageAfterResistanceEffect\@Mob\@\@UEBAMAEBVActorDamageSource\@\@M\@Z */ virtual float getDamageAfterResistanceEffect(class ActorDamageSource const &, float) const; /** - * @vftbl 331 + * @vftbl 323 * @symbol ?createAIGoals\@Mob\@\@UEAA_NXZ */ virtual bool createAIGoals(); /** - * @vftbl 332 + * @vftbl 324 * @symbol ?onBorn\@Mob\@\@UEAAXAEAVActor\@\@0\@Z */ virtual void onBorn(class Actor &, class Actor &); /** - * @vftbl 333 + * @vftbl 325 * @symbol ?setItemSlot\@Mob\@\@UEAA_NW4EquipmentSlot\@\@AEBVItemStack\@\@\@Z */ virtual bool setItemSlot(enum class EquipmentSlot, class ItemStack const &); /** - * @vftbl 334 + * @vftbl 326 * @symbol ?setTransitioningSitting\@Mob\@\@UEAAX_N\@Z */ virtual void setTransitioningSitting(bool); /** - * @vftbl 335 + * @vftbl 327 * @symbol ?attackAnimation\@Mob\@\@UEAAXPEAVActor\@\@M\@Z */ virtual void attackAnimation(class Actor *, float); /** - * @vftbl 336 + * @vftbl 328 * @symbol ?getAttackTime\@Mob\@\@UEAAHXZ */ virtual int getAttackTime(); /** - * @vftbl 337 + * @vftbl 329 * @symbol ?_getWalkTargetValue\@Mob\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 338 + * @vftbl 330 * @symbol ?canExistWhenDisallowMob\@Mob\@\@UEBA_NXZ */ virtual bool canExistWhenDisallowMob() const; /** - * @vftbl 339 + * @vftbl 331 * @symbol ?ascendLadder\@Mob\@\@UEAAXXZ */ virtual void ascendLadder(); /** - * @vftbl 340 + * @vftbl 332 * @symbol ?ascendBlockByJumping\@Mob\@\@UEAAXXZ */ virtual void ascendBlockByJumping(); /** - * @vftbl 341 + * @vftbl 333 * @symbol ?descendBlockByCrouching\@Mob\@\@UEAAXXZ */ virtual void descendBlockByCrouching(); /** - * @vftbl 342 + * @vftbl 334 * @symbol ?dropContainer\@Mob\@\@UEAAXXZ */ virtual void dropContainer(); /** - * @vftbl 343 + * @vftbl 335 * @symbol ?initBodyControl\@Mob\@\@MEAA?AV?$unique_ptr\@VBodyControl\@\@U?$default_delete\@VBodyControl\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr initBodyControl(); /** - * @vftbl 344 + * @vftbl 336 * @symbol ?jumpFromGround\@Mob\@\@MEAAXAEBVIConstBlockSource\@\@\@Z */ virtual void jumpFromGround(class IConstBlockSource const &); /** - * @vftbl 345 + * @vftbl 337 * @symbol ?jumpFromGround\@Mob\@\@MEBAXAEAUIMobMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z */ virtual void jumpFromGround(struct IMobMovementProxy &, class IConstBlockSource const &) const; /** - * @vftbl 346 + * @vftbl 338 * @symbol ?newServerAiStep\@Mob\@\@MEAAXXZ */ virtual void newServerAiStep(); /** - * @vftbl 347 + * @vftbl 339 * @symbol ?_serverAiMobStep\@Mob\@\@MEAAXXZ */ virtual void _serverAiMobStep(); /** - * @vftbl 348 + * @vftbl 340 * @symbol ?dropBags\@Mob\@\@MEAAXXZ */ virtual void dropBags(); /** - * @vftbl 349 + * @vftbl 341 * @symbol ?tickDeath\@Mob\@\@MEAAXXZ */ virtual void tickDeath(); /** - * @vftbl 350 + * @vftbl 342 * @symbol ?updateGliding\@Mob\@\@MEAAXXZ */ virtual void updateGliding(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** - * @vftbl 352 + * @vftbl 344 * @symbol ?_getAdjustedAABBForSpawnCheck\@Mob\@\@MEBA?AVAABB\@\@AEBV2\@AEBVVec3\@\@\@Z */ virtual class AABB _getAdjustedAABBForSpawnCheck(class AABB const &, class Vec3 const &) const; @@ -832,14 +827,14 @@ struct JumpPreventionResult { */ MCVAPI ~Mob(); #endif - /** - * @symbol ??0Mob\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z - */ - MCAPI Mob(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** * @symbol ??0Mob\@\@QEAA\@AEAVLevel\@\@AEAVEntityContext\@\@\@Z */ MCAPI Mob(class Level &, class EntityContext &); + /** + * @symbol ??0Mob\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + */ + MCAPI Mob(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** * @symbol ?_endJump\@Mob\@\@QEAAXXZ */ @@ -1184,10 +1179,6 @@ struct JumpPreventionResult { * @symbol ?TOTAL_ROLL_STEPS\@Mob\@\@2HB */ MCAPI static int const TOTAL_ROLL_STEPS; - /** - * @symbol ?_aiStep\@Mob\@\@SAXAEAUIMobMovementProxy\@\@\@Z - */ - MCAPI static void _aiStep(struct IMobMovementProxy &); /** * @symbol ?_calcMoveRelativeSpeed\@Mob\@\@SAMAEAUIMobMovementProxy\@\@W4TravelType\@\@AEBVIConstBlockSource\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MobArmorEquipmentPacket.hpp b/LiteLoader/include/llapi/mc/MobArmorEquipmentPacket.hpp index dd135aff72..b1d5ea6db4 100644 --- a/LiteLoader/include/llapi/mc/MobArmorEquipmentPacket.hpp +++ b/LiteLoader/include/llapi/mc/MobArmorEquipmentPacket.hpp @@ -51,9 +51,9 @@ class MobArmorEquipmentPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@MobArmorEquipmentPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@MobArmorEquipmentPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOBARMOREQUIPMENTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/MobEffect.hpp b/LiteLoader/include/llapi/mc/MobEffect.hpp index aaaeb258cd..fc52c8407d 100644 --- a/LiteLoader/include/llapi/mc/MobEffect.hpp +++ b/LiteLoader/include/llapi/mc/MobEffect.hpp @@ -298,9 +298,9 @@ class MobEffect { */ MCAPI static std::string getNameById(unsigned int); /** - * @symbol ?initEffects\@MobEffect\@\@SAXPEAVResourcePackManager\@\@AEBVExperiments\@\@\@Z + * @symbol ?initEffects\@MobEffect\@\@SAXPEAVResourcePackManager\@\@AEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z */ - MCAPI static void initEffects(class ResourcePackManager *, class Experiments const &); + MCAPI static void initEffects(class ResourcePackManager *, class BaseGameVersion const &, class Experiments const &); /** * @symbol ?mMobEffects\@MobEffect\@\@2PAV?$unique_ptr\@VMobEffect\@\@U?$default_delete\@VMobEffect\@\@\@std\@\@\@std\@\@A */ diff --git a/LiteLoader/include/llapi/mc/MobEffectInstance.hpp b/LiteLoader/include/llapi/mc/MobEffectInstance.hpp index b78833d75b..46c1f7ae97 100644 --- a/LiteLoader/include/llapi/mc/MobEffectInstance.hpp +++ b/LiteLoader/include/llapi/mc/MobEffectInstance.hpp @@ -31,13 +31,13 @@ char filler[122]; public: /** - * @symbol ??0MobEffectInstance\@\@QEAA\@IH\@Z + * @symbol ??0MobEffectInstance\@\@QEAA\@I\@Z */ - MCAPI MobEffectInstance(unsigned int, int); + MCAPI MobEffectInstance(unsigned int); /** - * @symbol ??0MobEffectInstance\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0MobEffectInstance\@\@QEAA\@IHH_N00\@Z */ - MCAPI MobEffectInstance(class MobEffectInstance const &); + MCAPI MobEffectInstance(unsigned int, int, int, bool, bool, bool); /** * @symbol ??0MobEffectInstance\@\@QEAA\@IHH\@Z */ @@ -46,18 +46,18 @@ char filler[122]; * @symbol ??0MobEffectInstance\@\@QEAA\@IHHHHH_N00\@Z */ 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\@$$QEAV0\@\@Z */ MCAPI MobEffectInstance(class MobEffectInstance &&); /** - * @symbol ??0MobEffectInstance\@\@QEAA\@I\@Z + * @symbol ??0MobEffectInstance\@\@QEAA\@AEBV0\@\@Z */ - MCAPI MobEffectInstance(unsigned int); + MCAPI MobEffectInstance(class MobEffectInstance const &); + /** + * @symbol ??0MobEffectInstance\@\@QEAA\@IH\@Z + */ + MCAPI MobEffectInstance(unsigned int, int); /** * @symbol ?applyEffects\@MobEffectInstance\@\@QEAAXPEAVActor\@\@\@Z */ @@ -74,6 +74,10 @@ char filler[122]; * @symbol ?getComponentName\@MobEffectInstance\@\@QEBAAEBVHashedString\@\@XZ */ MCAPI class HashedString const & getComponentName() const; + /** + * @symbol ?getDescriptionId\@MobEffectInstance\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + */ + MCAPI std::string getDescriptionId() const; /** * @symbol ?getDifficulityDuration\@MobEffectInstance\@\@QEBAHW4Difficulty\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MobEffectPacket.hpp b/LiteLoader/include/llapi/mc/MobEffectPacket.hpp index c7099f4a51..8b2720cd5a 100644 --- a/LiteLoader/include/llapi/mc/MobEffectPacket.hpp +++ b/LiteLoader/include/llapi/mc/MobEffectPacket.hpp @@ -51,22 +51,22 @@ class MobEffectPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@MobEffectPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@MobEffectPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOBEFFECTPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~MobEffectPacket(); #endif - /** - * @symbol ??0MobEffectPacket\@\@QEAA\@XZ - */ - MCAPI MobEffectPacket(); /** * @symbol ??0MobEffectPacket\@\@QEAA\@VActorRuntimeID\@\@W4Event\@0\@HHH_N\@Z */ MCAPI MobEffectPacket(class ActorRuntimeID, enum class MobEffectPacket::Event, int, int, int, bool); + /** + * @symbol ??0MobEffectPacket\@\@QEAA\@XZ + */ + MCAPI MobEffectPacket(); }; diff --git a/LiteLoader/include/llapi/mc/MobEquipmentPacket.hpp b/LiteLoader/include/llapi/mc/MobEquipmentPacket.hpp index 3645e95824..02440b7cf7 100644 --- a/LiteLoader/include/llapi/mc/MobEquipmentPacket.hpp +++ b/LiteLoader/include/llapi/mc/MobEquipmentPacket.hpp @@ -54,9 +54,9 @@ class MobEquipmentPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@MobEquipmentPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@MobEquipmentPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOBEQUIPMENTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/MobEvent.hpp b/LiteLoader/include/llapi/mc/MobEvent.hpp index b14f412140..04d266ef2c 100644 --- a/LiteLoader/include/llapi/mc/MobEvent.hpp +++ b/LiteLoader/include/llapi/mc/MobEvent.hpp @@ -28,14 +28,14 @@ class MobEvent { #endif public: - /** - * @symbol ??0MobEvent\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI MobEvent(class MobEvent const &); /** * @symbol ??0MobEvent\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_N\@Z */ MCAPI MobEvent(std::string, std::string, bool); + /** + * @symbol ??0MobEvent\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI MobEvent(class MobEvent const &); /** * @symbol ?getLocalizableName\@MobEvent\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/MobIsImmobileFilterSystem.hpp b/LiteLoader/include/llapi/mc/MobIsImmobileFilterSystem.hpp index 5226704047..925381da9e 100644 --- a/LiteLoader/include/llapi/mc/MobIsImmobileFilterSystem.hpp +++ b/LiteLoader/include/llapi/mc/MobIsImmobileFilterSystem.hpp @@ -29,15 +29,15 @@ class MobIsImmobileFilterSystem { */ MCAPI static struct TickingSystemWithInfo createSystem(); /** - * @symbol ?tick\@MobIsImmobileFilterSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@$$CBV?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@$$CBV?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@$$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 + * @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 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>); + 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 ?tickImmobileFitler\@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\@\@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 */ - MCAPI static void tickImmobileFitler(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(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>); private: diff --git a/LiteLoader/include/llapi/mc/MobJumpFromGroundSystem.hpp b/LiteLoader/include/llapi/mc/MobJumpFromGroundSystem.hpp index a66be9abc7..6b7b96238b 100644 --- a/LiteLoader/include/llapi/mc/MobJumpFromGroundSystem.hpp +++ b/LiteLoader/include/llapi/mc/MobJumpFromGroundSystem.hpp @@ -28,10 +28,6 @@ namespace MobJumpFromGroundSystem { * @symbol ?createFilterSystem\@MobJumpFromGroundSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ MCAPI struct TickingSystemWithInfo createFilterSystem(); - /** - * @symbol ?createSideBySideSystem\@MobJumpFromGroundSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI struct TickingSystemWithInfo createSideBySideSystem(); /** * @symbol ?createSystem\@MobJumpFromGroundSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/MobJumpFromGroundSystemImpl.hpp b/LiteLoader/include/llapi/mc/MobJumpFromGroundSystemImpl.hpp new file mode 100644 index 0000000000..405bb4f1ca --- /dev/null +++ b/LiteLoader/include/llapi/mc/MobJumpFromGroundSystemImpl.hpp @@ -0,0 +1,40 @@ +/** + * @file MobJumpFromGroundSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace MobJumpFromGroundSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?doFilter\@MobJumpFromGroundSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEBV?$Optional\@V?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@AEBV?$Optional\@V?$FlagComponent\@ULavaSlimeFlag\@\@\@\@\@\@AEBV?$Optional\@V?$FlagComponent\@USquidFlag\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@ULocalPlayerJumpRequestFlag\@\@\@\@V?$FlagComponent\@ULavaSlimeJumpRequestFlag\@\@\@\@V?$FlagComponent\@USquidJumpRequestFlag\@\@\@\@V?$FlagComponent\@UOtherJumpRequestFlag\@\@\@\@\@\@\@Z + */ + 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 + */ + MCAPI void doLavaSlimeJumpFromGround(class StrictEntityContext const &, struct AABBShapeComponent const &, struct SynchedActorDataComponent const &, struct StateVectorComponent &, 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 + */ + 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 &); + /** + * @symbol ?doOtherMobJumpFromGround\@MobJumpFromGroundSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEBV?$Optional\@$$CBVJumpControlComponent\@\@\@\@AEBUAABBShapeComponent\@\@AEBUSynchedActorDataComponent\@\@AEBUActorRotationComponent\@\@AEBUMobEffectsComponent\@\@AEAUMobJumpComponent\@\@AEAUStateVectorComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UTriggerJumpRequestComponent\@\@\@\@_NAEBVIConstBlockSource\@\@\@Z + */ + MCAPI void doOtherMobJumpFromGround(class StrictEntityContext const &, class Optional const &, struct AABBShapeComponent const &, struct SynchedActorDataComponent const &, struct ActorRotationComponent const &, struct MobEffectsComponent const &, struct MobJumpComponent &, struct StateVectorComponent &, class EntityModifierT &, bool, class IConstBlockSource const &); + /** + * @symbol ?mobJumpFromGround\@MobJumpFromGroundSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEBUSynchedActorDataComponent\@\@AEBUActorRotationComponent\@\@AEBUMobEffectsComponent\@\@PEBVJumpControlComponent\@\@AEAUMobJumpComponent\@\@AEAUStateVectorComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UTriggerJumpRequestComponent\@\@\@\@AEBVIConstBlockSource\@\@_N\@Z + */ + MCAPI void mobJumpFromGround(class StrictEntityContext const &, struct AABBShapeComponent const &, struct SynchedActorDataComponent const &, struct ActorRotationComponent const &, struct MobEffectsComponent const &, class JumpControlComponent const *, struct MobJumpComponent &, struct StateVectorComponent &, class EntityModifierT &, class IConstBlockSource const &, bool); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MobJumpSystem.hpp b/LiteLoader/include/llapi/mc/MobJumpSystem.hpp index 76ec8932fb..8b112f0421 100644 --- a/LiteLoader/include/llapi/mc/MobJumpSystem.hpp +++ b/LiteLoader/include/llapi/mc/MobJumpSystem.hpp @@ -32,9 +32,5 @@ namespace MobJumpSystem { * @symbol ?createResetNoJumpDelaySystem\@MobJumpSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ MCAPI struct TickingSystemWithInfo createResetNoJumpDelaySystem(); - /** - * @symbol ?createSideBySideMobJumpSystem\@MobJumpSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI struct TickingSystemWithInfo createSideBySideMobJumpSystem(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MobJumpSystemImpl.hpp b/LiteLoader/include/llapi/mc/MobJumpSystemImpl.hpp new file mode 100644 index 0000000000..2d082fc027 --- /dev/null +++ b/LiteLoader/include/llapi/mc/MobJumpSystemImpl.hpp @@ -0,0 +1,32 @@ +/** + * @file MobJumpSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace MobJumpSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?doDecrementNoJumpDelaySystem\@MobJumpSystemImpl\@\@YAXAEAVStrictEntityContext\@\@AEAUMobJumpComponent\@\@\@Z + */ + MCAPI void doDecrementNoJumpDelaySystem(class StrictEntityContext &, 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 + */ + MCAPI void doMobJumpSystem(class StrictEntityContext const &, class Optional, class Optional const>, class Optional const>, class Optional const>, class Optional const>, class Optional const>, class Optional const>, class Optional const>, class Optional const>, struct AABBShapeComponent const &, struct SwimAmountComponent const &, struct MobEffectsComponent const &, struct SubBBsComponent const &, struct SynchedActorDataComponent const &, struct MobJumpComponent &, struct StateVectorComponent &, class EntityModifierT>, class IConstBlockSource const &); + /** + * @symbol ?doResetNoJumpDelaySystem\@MobJumpSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEAUMobJumpComponent\@\@\@Z + */ + MCAPI void doResetNoJumpDelaySystem(class StrictEntityContext const &, struct MobJumpComponent &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MobSpawnRules.hpp b/LiteLoader/include/llapi/mc/MobSpawnRules.hpp index e9a1b1f511..a139361743 100644 --- a/LiteLoader/include/llapi/mc/MobSpawnRules.hpp +++ b/LiteLoader/include/llapi/mc/MobSpawnRules.hpp @@ -27,6 +27,10 @@ class MobSpawnRules { #endif public: + /** + * @symbol ??0MobSpawnRules\@\@QEAA\@XZ + */ + MCAPI MobSpawnRules(); /** * @symbol ??0MobSpawnRules\@\@QEAA\@$$QEAV0\@\@Z */ @@ -35,10 +39,6 @@ class MobSpawnRules { * @symbol ??0MobSpawnRules\@\@QEAA\@AEBV0\@\@Z */ MCAPI MobSpawnRules(class MobSpawnRules const &); - /** - * @symbol ??0MobSpawnRules\@\@QEAA\@XZ - */ - 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 5d6942a054..c457c2c1bf 100644 --- a/LiteLoader/include/llapi/mc/MobSpawnerBlock.hpp +++ b/LiteLoader/include/llapi/mc/MobSpawnerBlock.hpp @@ -46,20 +46,20 @@ class MobSpawnerBlock : public ActorBlock { */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@MobSpawnerBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 28 + * @symbol __unk_vfn_28 */ - virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; + virtual void __unk_vfn_28(); /** * @vftbl 29 * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -71,10 +71,10 @@ class MobSpawnerBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +106,10 @@ class MobSpawnerBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,15 +136,15 @@ class MobSpawnerBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -152,101 +152,96 @@ class MobSpawnerBlock : public ActorBlock { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@MobSpawnerBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 + */ + virtual void __unk_vfn_74(); + /** + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_169(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_173(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_177(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_186(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 - */ - virtual void __unk_vfn_179(); - /** - * @vftbl 187 - * @symbol __unk_vfn_187 - */ - virtual void __unk_vfn_187(); - /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@MobSpawnerBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @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 193bad83d2..8b42c9775d 100644 --- a/LiteLoader/include/llapi/mc/MobSpawnerBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/MobSpawnerBlockActor.hpp @@ -91,17 +91,17 @@ class MobSpawnerBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); /** - * @vftbl 37 + * @vftbl 39 * @symbol ?_getUpdatePacket\@MobSpawnerBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 38 + * @vftbl 40 * @symbol ?_onUpdatePacket\@MobSpawnerBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/MobTravelFilterSystem.hpp b/LiteLoader/include/llapi/mc/MobTravelFilterSystem.hpp index 24acdf53ca..6b8d28f049 100644 --- a/LiteLoader/include/llapi/mc/MobTravelFilterSystem.hpp +++ b/LiteLoader/include/llapi/mc/MobTravelFilterSystem.hpp @@ -20,5 +20,9 @@ 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/MobTravelFilterSystemImpl.hpp b/LiteLoader/include/llapi/mc/MobTravelFilterSystemImpl.hpp new file mode 100644 index 0000000000..0d0b0910a1 --- /dev/null +++ b/LiteLoader/include/llapi/mc/MobTravelFilterSystemImpl.hpp @@ -0,0 +1,24 @@ +/** + * @file MobTravelFilterSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace MobTravelFilterSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?addMobTravelComponent\@MobTravelFilterSystemImpl\@\@YAXAEBVStrictEntityContext\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMobTravelComponent\@\@\@\@\@Z + */ + MCAPI void addMobTravelComponent(class StrictEntityContext const &, class EntityModifierT); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MobTravelIntentSystemImpl.hpp b/LiteLoader/include/llapi/mc/MobTravelIntentSystemImpl.hpp new file mode 100644 index 0000000000..cc6989eb44 --- /dev/null +++ b/LiteLoader/include/llapi/mc/MobTravelIntentSystemImpl.hpp @@ -0,0 +1,24 @@ +/** + * @file MobTravelIntentSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace MobTravelIntentSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?updatedMoveVelocity\@MobTravelIntentSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEAULocalMoveVelocityComponent\@\@AEAUMobRotationComponent\@\@AEAUMobTravelComponent\@\@\@Z + */ + MCAPI void updatedMoveVelocity(class StrictEntityContext const &, struct LocalMoveVelocityComponent &, struct MobRotationComponent &, struct MobTravelComponent &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ModalFormRequestPacket.hpp b/LiteLoader/include/llapi/mc/ModalFormRequestPacket.hpp index f4e5964181..338e4b2261 100644 --- a/LiteLoader/include/llapi/mc/ModalFormRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/ModalFormRequestPacket.hpp @@ -54,22 +54,22 @@ class ModalFormRequestPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ModalFormRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ModalFormRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MODALFORMREQUESTPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~ModalFormRequestPacket(); #endif - /** - * @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(); + /** + * @symbol ??0ModalFormRequestPacket\@\@QEAA\@IAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI ModalFormRequestPacket(unsigned int, std::string const &); }; diff --git a/LiteLoader/include/llapi/mc/ModalFormResponsePacket.hpp b/LiteLoader/include/llapi/mc/ModalFormResponsePacket.hpp index c80ba2bda9..3922f0f8bf 100644 --- a/LiteLoader/include/llapi/mc/ModalFormResponsePacket.hpp +++ b/LiteLoader/include/llapi/mc/ModalFormResponsePacket.hpp @@ -55,9 +55,9 @@ class ModalFormResponsePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ModalFormResponsePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ModalFormResponsePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ModalFormResponsePacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/MolangMemberArray.hpp b/LiteLoader/include/llapi/mc/MolangMemberArray.hpp index d05bdb64fd..803371aa0f 100644 --- a/LiteLoader/include/llapi/mc/MolangMemberArray.hpp +++ b/LiteLoader/include/llapi/mc/MolangMemberArray.hpp @@ -29,10 +29,6 @@ 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 */ @@ -41,10 +37,6 @@ struct MolangMemberArray { * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_RGB\@\@AEBVColor\@mce\@\@\@Z */ MCAPI MolangMemberArray(enum class MolangStruct_RGB, class mce::Color const &); - /** - * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_MinAndMax\@\@$$QEAU0\@1\@Z - */ - MCAPI MolangMemberArray(enum class MolangStruct_MinAndMax, struct MolangMemberArray &&, struct MolangMemberArray &&); /** * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_XYZ\@\@AEBVVec3\@\@\@Z */ @@ -53,18 +45,26 @@ 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 + */ + MCAPI MolangMemberArray(enum class MolangStruct_XY, class Vec2 const &); /** * @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 + * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_MinAndMax\@\@$$QEAU0\@1\@Z */ - MCAPI MolangMemberArray(enum class MolangStruct_XY, class Vec2 const &); + MCAPI MolangMemberArray(enum class MolangStruct_MinAndMax, struct MolangMemberArray &&, struct MolangMemberArray &&); /** * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_PoseIndexAndHurtTime\@\@HH\@Z */ @@ -74,9 +74,9 @@ struct MolangMemberArray { */ MCAPI MolangMemberArray(enum class MolangStruct_UV, float, float); /** - * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_RotYAndPosY\@\@MM\@Z + * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_TentacleAngleAndSwimRotation\@\@MM\@Z */ - MCAPI MolangMemberArray(enum class MolangStruct_RotYAndPosY, float, float); + 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 15e2cf30f3..60770711c4 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\@H\@Z - */ - MCAPI MolangScriptArg(int); /** * @symbol ??0MolangScriptArg\@\@QEAA\@M\@Z */ MCAPI MolangScriptArg(float); /** - * @symbol ?getAsNonConstMolangMemberArray\@MolangScriptArg\@\@QEAAPEAUMolangMemberArray\@\@XZ + * @symbol ??0MolangScriptArg\@\@QEAA\@H\@Z */ - MCAPI struct MolangMemberArray * getAsNonConstMolangMemberArray(); + MCAPI MolangScriptArg(int); /** - * @symbol ??4MolangScriptArg\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ?getAsNonConstMolangMemberArray\@MolangScriptArg\@\@QEAAPEAUMolangMemberArray\@\@XZ */ - MCAPI struct MolangScriptArg & operator=(struct MolangScriptArg &&); + MCAPI struct MolangMemberArray * getAsNonConstMolangMemberArray(); /** * @symbol ??4MolangScriptArg\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct MolangScriptArg & operator=(struct MolangScriptArg const &); + /** + * @symbol ??4MolangScriptArg\@\@QEAAAEAU0\@$$QEAU0\@\@Z + */ + MCAPI struct MolangScriptArg & operator=(struct MolangScriptArg &&); /** * @symbol ??1MolangScriptArg\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/MolangVariable.hpp b/LiteLoader/include/llapi/mc/MolangVariable.hpp index fd7b2fc93d..5987633946 100644 --- a/LiteLoader/include/llapi/mc/MolangVariable.hpp +++ b/LiteLoader/include/llapi/mc/MolangVariable.hpp @@ -37,14 +37,14 @@ class MolangVariable { * @symbol ??1MolangVariable\@\@QEAA\@XZ */ MCAPI ~MolangVariable(); - /** - * @symbol ?getVariableIndex\@MolangVariable\@\@SA?AW4MolangVariableIndex\@\@_K\@Z - */ - MCAPI static enum class MolangVariableIndex getVariableIndex(unsigned __int64); /** * @symbol ?getVariableIndex\@MolangVariable\@\@SA?AW4MolangVariableIndex\@\@_KPEBD_N\@Z */ MCAPI static enum class MolangVariableIndex getVariableIndex(unsigned __int64, char const *, bool); + /** + * @symbol ?getVariableIndex\@MolangVariable\@\@SA?AW4MolangVariableIndex\@\@_K\@Z + */ + MCAPI static enum class MolangVariableIndex getVariableIndex(unsigned __int64); /** * @symbol ?getVariableIndex\@MolangVariable\@\@SA?AW4MolangVariableIndex\@\@AEBVHashedString\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/Monster.hpp b/LiteLoader/include/llapi/mc/Monster.hpp index bdbb42fb71..a56fa136b3 100644 --- a/LiteLoader/include/llapi/mc/Monster.hpp +++ b/LiteLoader/include/llapi/mc/Monster.hpp @@ -37,157 +37,152 @@ class Monster : public Mob { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@Monster\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 - */ - virtual void __unk_vfn_260(); - /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@Monster\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@Monster\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@Monster\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 293 + * @vftbl 285 * @symbol ?checkSpawnRules\@Monster\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 337 + * @vftbl 329 * @symbol ?_getWalkTargetValue\@Monster\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** - * @vftbl 353 + * @vftbl 345 * @symbol ?isDarkEnoughToSpawn\@Monster\@\@UEBA_NXZ */ virtual bool isDarkEnoughToSpawn() const; diff --git a/LiteLoader/include/llapi/mc/MonsterEggBlock.hpp b/LiteLoader/include/llapi/mc/MonsterEggBlock.hpp deleted file mode 100644 index 6e2725ca23..0000000000 --- a/LiteLoader/include/llapi/mc/MonsterEggBlock.hpp +++ /dev/null @@ -1,258 +0,0 @@ -/** - * @file MonsterEggBlock.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "InfestedBlock.hpp" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class MonsterEggBlock. - * - */ -class MonsterEggBlock : public InfestedBlock { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_MONSTEREGGBLOCK -public: - class MonsterEggBlock& operator=(class MonsterEggBlock const &) = delete; - MonsterEggBlock(class MonsterEggBlock const &) = delete; - MonsterEggBlock() = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); - /** - * @vftbl 30 - * @symbol __unk_vfn_30 - */ - virtual void __unk_vfn_30(); - /** - * @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 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 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 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 60 - * @symbol __unk_vfn_60 - */ - virtual void __unk_vfn_60(); - /** - * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 75 - * @symbol __unk_vfn_75 - */ - virtual void __unk_vfn_75(); - /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 103 - * @symbol ?asItemInstance\@MonsterEggBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z - */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; - /** - * @vftbl 105 - * @symbol __unk_vfn_105 - */ - virtual void __unk_vfn_105(); - /** - * @vftbl 123 - * @symbol __unk_vfn_123 - */ - virtual void __unk_vfn_123(); - /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 - */ - virtual void __unk_vfn_126(); - /** - * @vftbl 129 - * @symbol __unk_vfn_129 - */ - virtual void __unk_vfn_129(); - /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 - * @symbol ?buildDescriptionId\@MonsterEggBlock\@\@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 135 - * @symbol ?isAuxValueRelevantForPicking\@MonsterEggBlock\@\@UEBA_NXZ - */ - virtual bool isAuxValueRelevantForPicking() const; - /** - * @vftbl 147 - * @symbol ?getVariant\@MonsterEggBlock\@\@UEBAHAEBVBlock\@\@\@Z - */ - virtual int getVariant(class Block const &) const; - /** - * @vftbl 157 - * @symbol __unk_vfn_157 - */ - virtual void __unk_vfn_157(); - /** - * @vftbl 161 - * @symbol ?tryGetUninfested\@MonsterEggBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z - */ - virtual class Block const * tryGetUninfested(class Block const &) const; - /** - * @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 171 - * @symbol __unk_vfn_171 - */ - virtual void __unk_vfn_171(); - /** - * @vftbl 175 - * @symbol __unk_vfn_175 - */ - virtual void __unk_vfn_175(); - /** - * @vftbl 179 - * @symbol __unk_vfn_179 - */ - virtual void __unk_vfn_179(); - /** - * @vftbl 187 - * @symbol __unk_vfn_187 - */ - virtual void __unk_vfn_187(); - /** - * @symbol ??0MonsterEggBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z - */ - MCAPI MonsterEggBlock(std::string const &, int); - -}; diff --git a/LiteLoader/include/llapi/mc/MossBlock.hpp b/LiteLoader/include/llapi/mc/MossBlock.hpp index b3a10d0e21..6c77803733 100644 --- a/LiteLoader/include/llapi/mc/MossBlock.hpp +++ b/LiteLoader/include/llapi/mc/MossBlock.hpp @@ -40,16 +40,21 @@ class MossBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class MossBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class MossBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,115 +131,110 @@ class MossBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@MossBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@MossBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 d66a89a682..3c0d802b97 100644 --- a/LiteLoader/include/llapi/mc/MotionPredictionHintsPacket.hpp +++ b/LiteLoader/include/llapi/mc/MotionPredictionHintsPacket.hpp @@ -51,22 +51,22 @@ class MotionPredictionHintsPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@MotionPredictionHintsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@MotionPredictionHintsPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOTIONPREDICTIONHINTSPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~MotionPredictionHintsPacket(); #endif - /** - * @symbol ??0MotionPredictionHintsPacket\@\@QEAA\@XZ - */ - MCAPI MotionPredictionHintsPacket(); /** * @symbol ??0MotionPredictionHintsPacket\@\@QEAA\@AEBVActor\@\@\@Z */ MCAPI MotionPredictionHintsPacket(class Actor const &); + /** + * @symbol ??0MotionPredictionHintsPacket\@\@QEAA\@XZ + */ + MCAPI MotionPredictionHintsPacket(); }; diff --git a/LiteLoader/include/llapi/mc/MountainAttributes.hpp b/LiteLoader/include/llapi/mc/MountainAttributes.hpp index 15b75d8d96..6c8418860f 100644 --- a/LiteLoader/include/llapi/mc/MountainAttributes.hpp +++ b/LiteLoader/include/llapi/mc/MountainAttributes.hpp @@ -27,6 +27,14 @@ struct MountainAttributes { #endif public: + /** + * @symbol ??0MountainAttributes\@\@QEAA\@$$QEAU0\@\@Z + */ + MCAPI MountainAttributes(struct MountainAttributes &&); + /** + * @symbol ??4MountainAttributes\@\@QEAAAEAU0\@$$QEAU0\@\@Z + */ + MCAPI struct MountainAttributes & operator=(struct MountainAttributes &&); /** * @symbol ??1MountainAttributes\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/MoveActorAbsolutePacket.hpp b/LiteLoader/include/llapi/mc/MoveActorAbsolutePacket.hpp index 482fec5cf3..63c37d52fa 100644 --- a/LiteLoader/include/llapi/mc/MoveActorAbsolutePacket.hpp +++ b/LiteLoader/include/llapi/mc/MoveActorAbsolutePacket.hpp @@ -51,9 +51,9 @@ class MoveActorAbsolutePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@MoveActorAbsolutePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@MoveActorAbsolutePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 d714703f60..343b03bcad 100644 --- a/LiteLoader/include/llapi/mc/MoveActorDeltaPacket.hpp +++ b/LiteLoader/include/llapi/mc/MoveActorDeltaPacket.hpp @@ -51,9 +51,9 @@ class MoveActorDeltaPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@MoveActorDeltaPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@MoveActorDeltaPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 47b83886b3..260f90cc18 100644 --- a/LiteLoader/include/llapi/mc/MoveCollisionSystem.hpp +++ b/LiteLoader/include/llapi/mc/MoveCollisionSystem.hpp @@ -49,9 +49,9 @@ 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\@\@UPlayerGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@UAABBShapeComponent\@\@UDimensionTypeComponent\@\@\@\@U?$Write\@UMoveRequestComponent\@\@UTerrainSurfaceOffsetComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@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\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@UAABBShapeComponent\@\@UDimensionTypeComponent\@\@\@\@U?$Write\@UMoveRequestComponent\@\@UTerrainSurfaceOffsetComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@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, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); /** * @symbol ?createSideBySideSystem\@MoveCollisionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ @@ -61,8 +61,8 @@ class MoveCollisionSystem { */ 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\@\@UPlayerGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@UAABBShapeComponent\@\@UDimensionTypeComponent\@\@\@\@U?$Write\@UMoveRequestComponent\@\@UTerrainSurfaceOffsetComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@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\@\@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 */ - 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, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &, class IConstBlockSource const &); }; diff --git a/LiteLoader/include/llapi/mc/MoveHitboxSystem.hpp b/LiteLoader/include/llapi/mc/MoveHitboxSystem.hpp deleted file mode 100644 index a9b17f3659..0000000000 --- a/LiteLoader/include/llapi/mc/MoveHitboxSystem.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file MoveHitboxSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class MoveHitboxSystem. - * - */ -class MoveHitboxSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_MOVEHITBOXSYSTEM -public: - class MoveHitboxSystem& operator=(class MoveHitboxSystem const &) = delete; - MoveHitboxSystem(class MoveHitboxSystem const &) = delete; - MoveHitboxSystem() = delete; -#endif - -public: - /** - * @symbol ?createMoveHitboxSystem\@MoveHitboxSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createMoveHitboxSystem(); - /** - * @symbol ?moveHitboxTo\@MoveHitboxSystem\@\@SAXAEBVVec3\@\@AEAV?$vector\@UHitbox\@\@V?$allocator\@UHitbox\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI static void moveHitboxTo(class Vec3 const &, std::vector &); - -}; diff --git a/LiteLoader/include/llapi/mc/MoveInput.hpp b/LiteLoader/include/llapi/mc/MoveInput.hpp deleted file mode 100644 index 8d73e8c939..0000000000 --- a/LiteLoader/include/llapi/mc/MoveInput.hpp +++ /dev/null @@ -1,112 +0,0 @@ -/** - * @file MoveInput.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 MoveInput. - * - */ -class MoveInput { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_MOVEINPUT -public: - class MoveInput& operator=(class MoveInput const &) = delete; - MoveInput(class MoveInput const &) = delete; - MoveInput() = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?tick\@MoveInput\@\@UEAAXAEAUIPlayerMovementProxy\@\@\@Z - */ - virtual void tick(struct IPlayerMovementProxy &); - /** - * @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 ?clearInputState\@MoveInput\@\@UEAAXXZ - */ - virtual void clearInputState(); - /** - * @vftbl 5 - * @symbol __unk_vfn_5 - */ - virtual void __unk_vfn_5(); - /** - * @vftbl 6 - * @symbol ?allowPicking\@MoveInput\@\@UEAA_NMM\@Z - */ - virtual bool allowPicking(float, float); - /** - * @vftbl 7 - * @symbol ?setJumping\@MoveInput\@\@UEAAX_N\@Z - */ - virtual void setJumping(bool); - /** - * @vftbl 8 - * @symbol ?setAutoJumpingInWater\@MoveInput\@\@UEAAX_N\@Z - */ - virtual void setAutoJumpingInWater(bool); - /** - * @vftbl 9 - * @symbol ?isChangeHeight\@MoveInput\@\@UEBA_NXZ - */ - virtual bool isChangeHeight() const; - /** - * @vftbl 10 - * @symbol ?isPlayerMoving\@MoveInput\@\@UEBA_NXZ - */ - virtual bool isPlayerMoving() const; - /** - * @vftbl 11 - * @symbol ?extractInputComponent\@MoveInput\@\@UEBA?AUMoveInputComponent\@\@XZ - */ - virtual struct MoveInputComponent extractInputComponent() const; - /** - * @vftbl 12 - * @symbol ?applyInputComponent\@MoveInput\@\@UEAAXAEBUMoveInputComponent\@\@\@Z - */ - virtual void applyInputComponent(struct MoveInputComponent const &); -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVEINPUT - /** - * @symbol ?clearMovementState\@MoveInput\@\@UEAAXXZ - */ - MCVAPI void clearMovementState(); - /** - * @symbol ?render\@MoveInput\@\@UEAAXM\@Z - */ - MCVAPI void render(float); - /** - * @symbol ?setKey\@MoveInput\@\@UEAAXH_N\@Z - */ - MCVAPI void setKey(int, bool); -#endif - -}; diff --git a/LiteLoader/include/llapi/mc/MoveInputHandler.hpp b/LiteLoader/include/llapi/mc/MoveInputHandler.hpp deleted file mode 100644 index 57cfc52e6c..0000000000 --- a/LiteLoader/include/llapi/mc/MoveInputHandler.hpp +++ /dev/null @@ -1,112 +0,0 @@ -/** - * @file MoveInputHandler.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "MoveInput.hpp" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class MoveInputHandler. - * - */ -class MoveInputHandler : public MoveInput { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_MOVEINPUTHANDLER -public: - class MoveInputHandler& operator=(class MoveInputHandler const &) = delete; - MoveInputHandler(class MoveInputHandler const &) = delete; - MoveInputHandler() = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?tick\@MoveInputHandler\@\@UEAAXAEAUIPlayerMovementProxy\@\@\@Z - */ - virtual void tick(struct IPlayerMovementProxy &); - /** - * @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 ?clearInputState\@MoveInputHandler\@\@UEAAXXZ - */ - virtual void clearInputState(); - /** - * @vftbl 5 - * @symbol __unk_vfn_5 - */ - virtual void __unk_vfn_5(); - /** - * @vftbl 9 - * @symbol ?isChangeHeight\@MoveInputHandler\@\@UEBA_NXZ - */ - virtual bool isChangeHeight() const; - /** - * @vftbl 10 - * @symbol ?isPlayerMoving\@MoveInputHandler\@\@UEBA_NXZ - */ - virtual bool isPlayerMoving() const; - /** - * @vftbl 11 - * @symbol ?extractInputComponent\@MoveInputHandler\@\@UEBA?AUMoveInputComponent\@\@XZ - */ - virtual struct MoveInputComponent extractInputComponent() const; - /** - * @vftbl 12 - * @symbol ?applyInputComponent\@MoveInputHandler\@\@UEAAXAEBUMoveInputComponent\@\@\@Z - */ - virtual void applyInputComponent(struct MoveInputComponent const &); - /** - * @vftbl 13 - * @symbol ?fillInputPacket\@MoveInputHandler\@\@UEAAXAEAVPlayerAuthInputPacket\@\@\@Z - */ - virtual void fillInputPacket(class PlayerAuthInputPacket &); - /** - * @vftbl 14 - * @symbol __unk_vfn_14 - */ - virtual void __unk_vfn_14() = 0; - /** - * @vftbl 15 - * @symbol ?createSnapshot\@MoveInputHandler\@\@UEAA?AV?$unique_ptr\@UIReplayableActorInput\@\@U?$default_delete\@UIReplayableActorInput\@\@\@std\@\@\@std\@\@XZ - */ - virtual std::unique_ptr createSnapshot(); - /** - * @vftbl 16 - * @symbol ?getClientRawInputStateCopy\@MoveInputHandler\@\@UEBA?AUMoveInputState\@\@XZ - */ - virtual struct MoveInputState getClientRawInputStateCopy() const; - /** - * @symbol ?isSneakDown\@MoveInputHandler\@\@QEBA_NXZ - */ - MCAPI bool isSneakDown() const; - /** - * @symbol ?setInputState\@MoveInputHandler\@\@QEAAXAEAUMoveInputState\@\@\@Z - */ - MCAPI void setInputState(struct MoveInputState &); - -}; diff --git a/LiteLoader/include/llapi/mc/MoveInputState.hpp b/LiteLoader/include/llapi/mc/MoveInputState.hpp index ad714249d9..50a160e5f8 100644 --- a/LiteLoader/include/llapi/mc/MoveInputState.hpp +++ b/LiteLoader/include/llapi/mc/MoveInputState.hpp @@ -28,5 +28,9 @@ struct MoveInputState { * @symbol ??8MoveInputState\@\@QEBA_NAEBU0\@\@Z */ MCAPI bool operator==(struct MoveInputState const &) const; + /** + * @symbol ?wantsSneak\@MoveInputState\@\@QEBA_NXZ + */ + MCAPI bool wantsSneak() const; }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MovePlayerPacket.hpp b/LiteLoader/include/llapi/mc/MovePlayerPacket.hpp index 2ce1e7978a..785e30b411 100644 --- a/LiteLoader/include/llapi/mc/MovePlayerPacket.hpp +++ b/LiteLoader/include/llapi/mc/MovePlayerPacket.hpp @@ -87,9 +87,9 @@ class MovePlayerPacket : public Packet { virtual bool isValid() const; /** * @vftbl 7 - * @symbol ?_read\@MovePlayerPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@MovePlayerPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVEPLAYERPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/MovingBlock.hpp b/LiteLoader/include/llapi/mc/MovingBlock.hpp index 936d942fb8..77054432f4 100644 --- a/LiteLoader/include/llapi/mc/MovingBlock.hpp +++ b/LiteLoader/include/llapi/mc/MovingBlock.hpp @@ -45,16 +45,21 @@ class MovingBlock : public ActorBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class MovingBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class MovingBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,135 +136,130 @@ class MovingBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 81 + * @vftbl 80 * @symbol ?updateEntityAfterFallOn\@MovingBlock\@\@UEBAXAEBVBlockPos\@\@AEAUUpdateEntityAfterFallOnInterface\@\@\@Z */ virtual void updateEntityAfterFallOn(class BlockPos const &, struct UpdateEntityAfterFallOnInterface &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 101 + * @vftbl 100 * @symbol ?playerWillDestroy\@MovingBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 102 + * @vftbl 101 * @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 103 + * @vftbl 102 * @symbol ?asItemInstance\@MovingBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 143 + * @vftbl 141 * @symbol ?getVisualShapeInWorld\@MovingBlock\@\@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 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?onFallOn\@MovingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #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 d35077ee70..7902c9e26a 100644 --- a/LiteLoader/include/llapi/mc/MovingBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/MovingBlockActor.hpp @@ -106,17 +106,17 @@ class MovingBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); /** - * @vftbl 37 + * @vftbl 39 * @symbol ?_getUpdatePacket\@MovingBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 38 + * @vftbl 40 * @symbol ?_onUpdatePacket\@MovingBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/MudBlock.hpp b/LiteLoader/include/llapi/mc/MudBlock.hpp index efa9a9a3ea..26a4e7c217 100644 --- a/LiteLoader/include/llapi/mc/MudBlock.hpp +++ b/LiteLoader/include/llapi/mc/MudBlock.hpp @@ -48,16 +48,21 @@ class MudBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -69,10 +74,10 @@ class MudBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -104,10 +109,10 @@ class MudBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -134,120 +139,120 @@ class MudBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 52 + * @vftbl 51 * @symbol ?canBeOriginalSurface\@MudBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 96 + * @vftbl 95 * @symbol ?breaksFallingBlocks\@MudBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 161 + * @symbol ?onRemove\@MudBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_157(); + virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 173 + * @vftbl 171 * @symbol ?randomTick\@MudBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 4c399f629e..fe4d443b64 100644 --- a/LiteLoader/include/llapi/mc/MultifaceBlock.hpp +++ b/LiteLoader/include/llapi/mc/MultifaceBlock.hpp @@ -45,16 +45,21 @@ class MultifaceBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -67,14 +72,14 @@ class MultifaceBlock : public BlockLegacy { virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol __unk_vfn_34 + * @symbol ?isWaterBlocking\@MultifaceBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_34(); + virtual bool isWaterBlocking() const; /** * @vftbl 35 - * @symbol ?isWaterBlocking\@MultifaceBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_35 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +111,10 @@ class MultifaceBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,152 +141,147 @@ class MultifaceBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 57 + * @vftbl 56 * @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 + */ + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 91 + * @vftbl 90 * @symbol ?mayPlace\@MultifaceBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@MultifaceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 143 + * @vftbl 141 * @symbol ?getVisualShapeInWorld\@MultifaceBlock\@\@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 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@MultifaceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 176 + * @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 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@MultifaceBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 195 + * @vftbl 194 * @symbol ?getMultifaceBlock\@GlowLichenBlock\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getMultifaceBlock() const = 0; /** - * @vftbl 196 + * @vftbl 195 * @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 0bcbc8c9b7..abec1d217d 100644 --- a/LiteLoader/include/llapi/mc/MultiplayerSettingsPacket.hpp +++ b/LiteLoader/include/llapi/mc/MultiplayerSettingsPacket.hpp @@ -51,9 +51,9 @@ class MultiplayerSettingsPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@MultiplayerSettingsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@MultiplayerSettingsPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 4eda0b8a46..9b89b54d6c 100644 --- a/LiteLoader/include/llapi/mc/MushroomBlock.hpp +++ b/LiteLoader/include/llapi/mc/MushroomBlock.hpp @@ -5,7 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "BlockLegacy.hpp" +#include "BushBlock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +16,7 @@ * @brief MC class MushroomBlock. * */ -class MushroomBlock : public BlockLegacy { +class MushroomBlock : public BushBlock { #define AFTER_EXTRA // Add Member There @@ -40,16 +40,21 @@ class MushroomBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class MushroomBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class MushroomBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,15 +131,15 @@ class MushroomBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -142,134 +147,129 @@ class MushroomBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@MushroomBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@MushroomBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@MushroomBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 91 + * @vftbl 90 * @symbol ?mayPlace\@MushroomBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 93 + * @vftbl 92 * @symbol ?mayPlaceOn\@MushroomBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_169(); /** * @vftbl 171 - * @symbol __unk_vfn_171 - */ - virtual void __unk_vfn_171(); - /** - * @vftbl 173 * @symbol ?randomTick\@MushroomBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@MushroomBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 181 + * @vftbl 179 * @symbol ?getRenderLayer\@MushroomBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 182 + * @vftbl 180 * @symbol ?getRenderLayer\@MushroomBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 4f92ec0dcc..93d5172c00 100644 --- a/LiteLoader/include/llapi/mc/MushroomCow.hpp +++ b/LiteLoader/include/llapi/mc/MushroomCow.hpp @@ -37,130 +37,125 @@ class MushroomCow : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_267(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 - */ - virtual void __unk_vfn_275(); - /** - * @vftbl 293 + * @vftbl 285 * @symbol ?checkSpawnRules\@MushroomCow\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0MushroomCow\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MusicBlockActor.hpp b/LiteLoader/include/llapi/mc/MusicBlockActor.hpp index 223fd13ac5..ea8d35ce31 100644 --- a/LiteLoader/include/llapi/mc/MusicBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/MusicBlockActor.hpp @@ -81,10 +81,10 @@ class MusicBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); /** * @symbol ??0MusicBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MyceliumBlock.hpp b/LiteLoader/include/llapi/mc/MyceliumBlock.hpp index 11b641a155..28df94b4d1 100644 --- a/LiteLoader/include/llapi/mc/MyceliumBlock.hpp +++ b/LiteLoader/include/llapi/mc/MyceliumBlock.hpp @@ -40,16 +40,21 @@ class MyceliumBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class MyceliumBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class MyceliumBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,117 +131,112 @@ class MyceliumBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@MyceliumBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 173 + * @vftbl 171 * @symbol ?randomTick\@MyceliumBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @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/NavigationComponent.hpp b/LiteLoader/include/llapi/mc/NavigationComponent.hpp index 06aa750eba..ba5860c8f9 100644 --- a/LiteLoader/include/llapi/mc/NavigationComponent.hpp +++ b/LiteLoader/include/llapi/mc/NavigationComponent.hpp @@ -175,14 +175,14 @@ class NavigationComponent { * @symbol ?moveTo\@NavigationComponent\@\@QEAA_NAEAVMob\@\@AEBVVec3\@\@M\@Z */ MCAPI bool moveTo(class Mob &, class Vec3 const &, float); - /** - * @symbol ?moveTo\@NavigationComponent\@\@QEAA_NAEAVMob\@\@AEAVActor\@\@M\@Z - */ - 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 */ diff --git a/LiteLoader/include/llapi/mc/NavigationDescription.hpp b/LiteLoader/include/llapi/mc/NavigationDescription.hpp index 01dfabb86b..b5e1e343f2 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\@NavigationFlyDescription\@\@UEBAPEBDXZ + * @symbol ?getJsonName\@NavigationWalkDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const = 0; /** diff --git a/LiteLoader/include/llapi/mc/NetherFungusBlock.hpp b/LiteLoader/include/llapi/mc/NetherFungusBlock.hpp index ba85adfc7c..a4fefff48a 100644 --- a/LiteLoader/include/llapi/mc/NetherFungusBlock.hpp +++ b/LiteLoader/include/llapi/mc/NetherFungusBlock.hpp @@ -45,16 +45,21 @@ class NetherFungusBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class NetherFungusBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class NetherFungusBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,15 +136,15 @@ class NetherFungusBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -147,129 +152,124 @@ class NetherFungusBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@NetherFungusBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@NetherFungusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@NetherFungusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 91 + * @vftbl 90 * @symbol ?mayPlace\@NetherFungusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 93 + * @vftbl 92 * @symbol ?mayPlaceOn\@NetherFungusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@NetherFungusBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@NetherFungusBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@NetherFungusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #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 0bacc99e02..29e794e755 100644 --- a/LiteLoader/include/llapi/mc/NetherNetConnector.hpp +++ b/LiteLoader/include/llapi/mc/NetherNetConnector.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Connector.hpp" #define BEFORE_EXTRA @@ -24,18 +25,124 @@ struct NetherNetConnector { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETHERNETCONNECTOR /** - * @symbol ?disableBroadcastDiscovery\@NetherNetConnector\@\@QEAAXXZ + * @symbol ?OnBroadcastDiscoveryRequestReceivedGetResponse\@NetherNetConnector\@\@EEAA_NPEAXPEAH\@Z */ - MCAPI void disableBroadcastDiscovery(); + MCVAPI bool OnBroadcastDiscoveryRequestReceivedGetResponse(void *, int *); /** - * @symbol ?enableBroadcastDiscovery\@NetherNetConnector\@\@QEAAXXZ + * @symbol ?OnBroadcastResponseReceived\@NetherNetConnector\@\@EEAAXUNetworkID\@NetherNet\@\@PEBXH\@Z */ - MCAPI void enableBroadcastDiscovery(); + MCVAPI void OnBroadcastResponseReceived(struct NetherNet::NetworkID, void const *, int); /** - * @symbol ?isBroadcastDiscoveryEnabled\@NetherNetConnector\@\@QEAA_NXZ + * @symbol ?OnSessionConnectFailure\@NetherNetConnector\@\@EEAAXUNetworkID\@NetherNet\@\@W4ESessionError\@3\@\@Z */ - MCAPI bool isBroadcastDiscoveryEnabled(); + MCVAPI void OnSessionConnectFailure(struct NetherNet::NetworkID, enum class NetherNet::ESessionError); + /** + * @symbol ?OnSessionGetConnectionFlags\@NetherNetConnector\@\@EEAAXUNetworkID\@NetherNet\@\@PEAI\@Z + */ + MCVAPI void OnSessionGetConnectionFlags(struct NetherNet::NetworkID, unsigned int *); + /** + * @symbol ?OnSessionRequested\@NetherNetConnector\@\@EEAAXUNetworkID\@NetherNet\@\@\@Z + */ + MCVAPI void OnSessionRequested(struct NetherNet::NetworkID); + /** + * @symbol ?OnSpopViolation\@NetherNetConnector\@\@EEAAXXZ + */ + MCVAPI void OnSpopViolation(); + /** + * @symbol ?_onDisable\@NetherNetConnector\@\@EEAAXXZ + */ + MCVAPI void _onDisable(); + /** + * @symbol ?_onEnable\@NetherNetConnector\@\@EEAAXXZ + */ + MCVAPI void _onEnable(); + /** + * @symbol ?closeNetworkConnection\@NetherNetConnector\@\@UEAAXAEBVNetworkIdentifier\@\@\@Z + */ + MCVAPI void closeNetworkConnection(class NetworkIdentifier const &); + /** + * @symbol ?connect\@NetherNetConnector\@\@UEAA_NAEBVGameConnectionInfo\@Social\@\@0\@Z + */ + MCVAPI bool connect(class Social::GameConnectionInfo const &, class Social::GameConnectionInfo const &); + /** + * @symbol ?disconnect\@NetherNetConnector\@\@UEAAXXZ + */ + MCVAPI void disconnect(); + /** + * @symbol ?getNetworkIdentifier\@NetherNetConnector\@\@UEBA?AVNetworkIdentifier\@\@XZ + */ + MCVAPI class NetworkIdentifier getNetworkIdentifier() const; + /** + * @symbol ?host\@NetherNetConnector\@\@UEAA_NAEBUConnectionDefinition\@\@\@Z + */ + MCVAPI bool host(struct ConnectionDefinition const &); + /** + * @symbol ?isConnected\@NetherNetConnector\@\@UEBA_NAEBVNetworkIdentifier\@\@\@Z + */ + MCVAPI bool isConnected(class NetworkIdentifier const &) const; + /** + * @symbol ?isServer\@NetherNetConnector\@\@UEBA_NXZ + */ + MCVAPI bool isServer() const; + /** + * @symbol ?runEvents\@NetherNetConnector\@\@UEAAXXZ + */ + MCVAPI void runEvents(); + /** + * @symbol ?tick\@NetherNetConnector\@\@UEAAXXZ + */ + MCVAPI void tick(); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NetherNetConnector(); +#endif + /** + * @symbol ??0NetherNetConnector\@\@QEAA\@AEBVNetherNetTransportFactory\@\@AEAUConnectionCallbacks\@Connector\@\@\@Z + */ + MCAPI NetherNetConnector(class NetherNetTransportFactory const &, struct Connector::ConnectionCallbacks &); + /** + * @symbol ?clearPacketData\@NetherNetConnector\@\@QEBAXUNetworkID\@NetherNet\@\@\@Z + */ + MCAPI void clearPacketData(struct NetherNet::NetworkID) const; + /** + * @symbol ?closeSessionWithUser\@NetherNetConnector\@\@QEBA_NUNetworkID\@NetherNet\@\@\@Z + */ + MCAPI bool closeSessionWithUser(struct NetherNet::NetworkID) const; + /** + * @symbol ?disableBroadcastDiscovery\@NetherNetConnector\@\@QEBAXXZ + */ + MCAPI void disableBroadcastDiscovery() const; + /** + * @symbol ?enableBroadcastDiscovery\@NetherNetConnector\@\@QEBAXXZ + */ + MCAPI void enableBroadcastDiscovery() const; + /** + * @symbol ?getNetworkID\@NetherNetConnector\@\@QEBAAEBUNetworkID\@NetherNet\@\@XZ + */ + MCAPI struct NetherNet::NetworkID const & getNetworkID() const; + /** + * @symbol ?getSessionState\@NetherNetConnector\@\@QEBA_NUNetworkID\@NetherNet\@\@PEAUSessionState\@3\@\@Z + */ + MCAPI bool getSessionState(struct NetherNet::NetworkID, struct NetherNet::SessionState *) const; + /** + * @symbol ?isBroadcastDiscoveryEnabled\@NetherNetConnector\@\@QEBA_NXZ + */ + MCAPI bool isBroadcastDiscoveryEnabled() const; + /** + * @symbol ?isPacketAvailable\@NetherNetConnector\@\@QEBA_NUNetworkID\@NetherNet\@\@PEAI\@Z + */ + MCAPI bool isPacketAvailable(struct NetherNet::NetworkID, unsigned int *) const; + /** + * @symbol ?readPacket\@NetherNetConnector\@\@QEBA_NUNetworkID\@NetherNet\@\@PEAXIPEAI\@Z + */ + MCAPI bool readPacket(struct NetherNet::NetworkID, void *, unsigned int, unsigned int *) const; + /** + * @symbol ?sendPacket\@NetherNetConnector\@\@QEBA_NUNetworkID\@NetherNet\@\@PEBDIW4ESendType\@3\@\@Z + */ + MCAPI bool sendPacket(struct NetherNet::NetworkID, char const *, unsigned int, enum class NetherNet::ESendType) const; /** * @symbol ?setBroadcastRequestCallback\@NetherNetConnector\@\@QEAAX$$QEAV?$function\@$$A6A_NPEAXPEAH\@Z\@std\@\@\@Z */ @@ -44,5 +151,9 @@ struct NetherNetConnector { * @symbol ?setBroadcastResponseCallback\@NetherNetConnector\@\@QEAAX$$QEAV?$function\@$$A6AXAEBUNetworkID\@NetherNet\@\@PEBXH\@Z\@std\@\@\@Z */ MCAPI void setBroadcastResponseCallback(class std::function &&); + /** + * @symbol ?signOutFromSignalingService\@NetherNetConnector\@\@QEBAXXZ + */ + MCAPI void signOutFromSignalingService() const; }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/NetherNetServerLocator.hpp b/LiteLoader/include/llapi/mc/NetherNetServerLocator.hpp index 52af3c507a..daba5abbd2 100644 --- a/LiteLoader/include/llapi/mc/NetherNetServerLocator.hpp +++ b/LiteLoader/include/llapi/mc/NetherNetServerLocator.hpp @@ -53,14 +53,14 @@ struct ServerData { virtual void __unk_vfn_2(); /** * @vftbl 3 - * @symbol ?startAnnouncingServer\@NetherNetServerLocator\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0W4GameType\@\@HH_N2W4TransportLayer\@\@\@Z + * @symbol ?startAnnouncingServer\@NetherNetServerLocator\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0V?$NonOwnerPointer\@VAppPlatform\@\@\@Bedrock\@\@W4GameType\@\@HH_N3\@Z */ - virtual void startAnnouncingServer(std::string const &, std::string const &, enum class GameType, int, int, bool, bool, enum class TransportLayer); + virtual void startAnnouncingServer(std::string const &, std::string const &, class Bedrock::NonOwnerPointer, enum class GameType, int, int, bool, bool); /** * @vftbl 4 - * @symbol ?stopAnnouncingServer\@NetherNetServerLocator\@\@UEAAXXZ + * @symbol ?stopAnnouncingServer\@NetherNetServerLocator\@\@UEAAXV?$NonOwnerPointer\@VAppPlatform\@\@\@Bedrock\@\@\@Z */ - virtual void stopAnnouncingServer(); + virtual void stopAnnouncingServer(class Bedrock::NonOwnerPointer); /** * @vftbl 5 * @symbol ?startServerDiscovery\@NetherNetServerLocator\@\@UEAAXUPortPair\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/NetherNetSignalServiceSigninJob.hpp b/LiteLoader/include/llapi/mc/NetherNetSignalServiceSigninJob.hpp new file mode 100644 index 0000000000..3014dfdfb7 --- /dev/null +++ b/LiteLoader/include/llapi/mc/NetherNetSignalServiceSigninJob.hpp @@ -0,0 +1,44 @@ +/** + * @file NetherNetSignalServiceSigninJob.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Bedrock.hpp" +#include "Social.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class NetherNetSignalServiceSigninJob { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_NETHERNETSIGNALSERVICESIGNINJOB +public: + class NetherNetSignalServiceSigninJob& operator=(class NetherNetSignalServiceSigninJob const &) = delete; + NetherNetSignalServiceSigninJob(class NetherNetSignalServiceSigninJob const &) = delete; + NetherNetSignalServiceSigninJob() = delete; +#endif + +public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETHERNETSIGNALSERVICESIGNINJOB + /** + * @symbol ?signin\@NetherNetSignalServiceSigninJob\@\@UEAAX_N\@Z + */ + MCVAPI void signin(bool); + /** + * @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 + */ + MCAPI NetherNetSignalServiceSigninJob(class gsl::not_null> &&, class std::function &&, class std::function &&, class gsl::not_null>, class gsl::not_null>, class gsl::not_null>); + +}; diff --git a/LiteLoader/include/llapi/mc/NetherReactorBlock.hpp b/LiteLoader/include/llapi/mc/NetherReactorBlock.hpp index cbf00571f1..0bedac8931 100644 --- a/LiteLoader/include/llapi/mc/NetherReactorBlock.hpp +++ b/LiteLoader/include/llapi/mc/NetherReactorBlock.hpp @@ -40,16 +40,21 @@ class NetherReactorBlock : public ActorBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class NetherReactorBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class NetherReactorBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,112 +131,107 @@ class NetherReactorBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 102 + * @vftbl 101 * @symbol ?spawnResources\@NetherReactorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 190 + * @vftbl 189 * @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 e11ca69884..f8d1eaa340 100644 --- a/LiteLoader/include/llapi/mc/NetherReactorBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/NetherReactorBlockActor.hpp @@ -81,10 +81,10 @@ class NetherReactorBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); /** * @symbol ??0NetherReactorBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/NetherSprouts.hpp b/LiteLoader/include/llapi/mc/NetherSproutsBlock.hpp similarity index 51% rename from LiteLoader/include/llapi/mc/NetherSprouts.hpp rename to LiteLoader/include/llapi/mc/NetherSproutsBlock.hpp index c5268d1d03..2d020ec506 100644 --- a/LiteLoader/include/llapi/mc/NetherSprouts.hpp +++ b/LiteLoader/include/llapi/mc/NetherSproutsBlock.hpp @@ -1,5 +1,5 @@ /** - * @file NetherSprouts.hpp + * @file NetherSproutsBlock.hpp * */ #pragma once @@ -8,25 +8,20 @@ #include "BlockLegacy.hpp" #define BEFORE_EXTRA -// Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC class NetherSprouts. - * - */ -class NetherSprouts : public BlockLegacy { + +class NetherSproutsBlock : public BlockLegacy { #define AFTER_EXTRA -// Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_NETHERSPROUTS +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_NETHERSPROUTSBLOCK public: - class NetherSprouts& operator=(class NetherSprouts const &) = delete; - NetherSprouts(class NetherSprouts const &) = delete; - NetherSprouts() = delete; + class NetherSproutsBlock& operator=(class NetherSproutsBlock const &) = delete; + NetherSproutsBlock(class NetherSproutsBlock const &) = delete; + NetherSproutsBlock() = delete; #endif public: @@ -37,12 +32,12 @@ class NetherSprouts : public BlockLegacy { virtual void __unk_vfn_0(); /** * @vftbl 8 - * @symbol ?randomlyModifyPosition\@NetherSprouts\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z + * @symbol ?randomlyModifyPosition\@NetherSproutsBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** * @vftbl 10 - * @symbol ?getAABB\@NetherSprouts\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @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; /** @@ -50,16 +45,21 @@ class NetherSprouts : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -71,10 +71,10 @@ class NetherSprouts : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +106,10 @@ class NetherSprouts : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,15 +136,15 @@ class NetherSprouts : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -152,143 +152,138 @@ class NetherSprouts : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 - * @symbol ?canContainLiquid\@NetherSprouts\@\@UEBA_NXZ + * @symbol ?canContainLiquid\@NetherSproutsBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 92 - * @symbol ?mayPlace\@NetherSprouts\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 91 + * @symbol ?mayPlace\@NetherSproutsBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 93 - * @symbol ?mayPlaceOn\@NetherSprouts\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlaceOn\@NetherSproutsBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@NetherSprouts\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 98 + * @symbol ?neighborChanged\@NetherSproutsBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@NetherSprouts\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 102 + * @symbol ?asItemInstance\@NetherSproutsBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_169(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 - */ - virtual void __unk_vfn_168(); - /** - * @vftbl 171 - * @symbol __unk_vfn_171 - */ - virtual void __unk_vfn_171(); - /** - * @vftbl 172 - * @symbol ?tick\@NetherSprouts\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 170 + * @symbol ?tick\@NetherSproutsBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 - * @symbol ?canSurvive\@NetherSprouts\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol ?canSurvive\@NetherSproutsBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 - * @symbol ?playerDestroy\@NetherSprouts\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 187 + * @symbol ?playerDestroy\@NetherSproutsBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 - * @symbol ?getResourceItem\@NetherSprouts\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@NetherSproutsBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETHERSPROUTS +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETHERSPROUTSBLOCK /** - * @symbol ?canBeSilkTouched\@NetherSprouts\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@NetherSproutsBlock\@\@UEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; #endif /** - * @symbol ??0NetherSprouts\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0NetherSproutsBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ - MCAPI NetherSprouts(std::string const &, int); + MCAPI NetherSproutsBlock(std::string const &, int); }; diff --git a/LiteLoader/include/llapi/mc/NetherWartBlock.hpp b/LiteLoader/include/llapi/mc/NetherWartBlock.hpp index 68887f07da..ffbca53275 100644 --- a/LiteLoader/include/llapi/mc/NetherWartBlock.hpp +++ b/LiteLoader/include/llapi/mc/NetherWartBlock.hpp @@ -5,7 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "BlockLegacy.hpp" +#include "BushBlock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +16,7 @@ * @brief MC class NetherWartBlock. * */ -class NetherWartBlock : public BlockLegacy { +class NetherWartBlock : public BushBlock { #define AFTER_EXTRA // Add Member There @@ -45,16 +45,21 @@ class NetherWartBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class NetherWartBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class NetherWartBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,15 +136,15 @@ class NetherWartBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -147,121 +152,116 @@ class NetherWartBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@NetherWartBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 93 + * @vftbl 92 * @symbol ?mayPlaceOn\@NetherWartBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@NetherWartBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_167(); - /** - * @vftbl 168 - * @symbol __unk_vfn_168 - */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_169(); /** * @vftbl 171 - * @symbol __unk_vfn_171 - */ - virtual void __unk_vfn_171(); - /** - * @vftbl 173 * @symbol ?randomTick\@NetherWartBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@NetherWartBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@NetherWartBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @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 795c0e002d..fbc63fcff2 100644 --- a/LiteLoader/include/llapi/mc/NetheriteArmorEquippedListener.hpp +++ b/LiteLoader/include/llapi/mc/NetheriteArmorEquippedListener.hpp @@ -161,11 +161,6 @@ class NetheriteArmorEquippedListener { virtual void __unk_vfn_25(); /** * @vftbl 26 - * @symbol __unk_vfn_26 - */ - virtual void __unk_vfn_26(); - /** - * @vftbl 27 * @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 bb935a46e8..9a332f113f 100644 --- a/LiteLoader/include/llapi/mc/NetherrackBlock.hpp +++ b/LiteLoader/include/llapi/mc/NetherrackBlock.hpp @@ -40,16 +40,21 @@ class NetherrackBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class NetherrackBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class NetherrackBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,115 +131,110 @@ class NetherrackBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@NetherrackBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@NetherrackBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 07c0bef074..d77334ada4 100644 --- a/LiteLoader/include/llapi/mc/NetworkChunkPublisherUpdatePacket.hpp +++ b/LiteLoader/include/llapi/mc/NetworkChunkPublisherUpdatePacket.hpp @@ -51,22 +51,22 @@ class NetworkChunkPublisherUpdatePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@NetworkChunkPublisherUpdatePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@NetworkChunkPublisherUpdatePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETWORKCHUNKPUBLISHERUPDATEPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~NetworkChunkPublisherUpdatePacket(); #endif - /** - * @symbol ??0NetworkChunkPublisherUpdatePacket\@\@QEAA\@AEBVBlockPos\@\@I\@Z - */ - MCAPI NetworkChunkPublisherUpdatePacket(class BlockPos const &, unsigned int); /** * @symbol ??0NetworkChunkPublisherUpdatePacket\@\@QEAA\@XZ */ MCAPI NetworkChunkPublisherUpdatePacket(); + /** + * @symbol ??0NetworkChunkPublisherUpdatePacket\@\@QEAA\@AEBVBlockPos\@\@I\@Z + */ + MCAPI NetworkChunkPublisherUpdatePacket(class BlockPos const &, unsigned int); }; diff --git a/LiteLoader/include/llapi/mc/NetworkItemInstanceDescriptor.hpp b/LiteLoader/include/llapi/mc/NetworkItemInstanceDescriptor.hpp index 6f85c0a0a8..ca4a3c82af 100644 --- a/LiteLoader/include/llapi/mc/NetworkItemInstanceDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/NetworkItemInstanceDescriptor.hpp @@ -42,6 +42,10 @@ class NetworkItemInstanceDescriptor : public ItemDescriptorCount { */ MCVAPI ~NetworkItemInstanceDescriptor(); #endif + /** + * @symbol ??0NetworkItemInstanceDescriptor\@\@QEAA\@AEBVItemInstance\@\@\@Z + */ + MCAPI NetworkItemInstanceDescriptor(class ItemInstance const &); /** * @symbol ??0NetworkItemInstanceDescriptor\@\@QEAA\@AEBVItemStackDescriptor\@\@\@Z */ @@ -50,10 +54,6 @@ class NetworkItemInstanceDescriptor : public ItemDescriptorCount { * @symbol ??0NetworkItemInstanceDescriptor\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI NetworkItemInstanceDescriptor(class NetworkItemInstanceDescriptor &&); - /** - * @symbol ??0NetworkItemInstanceDescriptor\@\@QEAA\@AEBVItemInstance\@\@\@Z - */ - MCAPI NetworkItemInstanceDescriptor(class ItemInstance const &); /** * @symbol ?getItemInstance\@NetworkItemInstanceDescriptor\@\@QEBA?AVItemInstance\@\@AEBVBlockPalette\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/NetworkItemStackDescriptor.hpp b/LiteLoader/include/llapi/mc/NetworkItemStackDescriptor.hpp index d0af4bf373..03eb0341b8 100644 --- a/LiteLoader/include/llapi/mc/NetworkItemStackDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/NetworkItemStackDescriptor.hpp @@ -45,25 +45,25 @@ class NetworkItemStackDescriptor : public ItemDescriptorCount { MCVAPI ~NetworkItemStackDescriptor(); #endif /** - * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@XZ + * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@AEBV0\@\@Z */ - MCAPI NetworkItemStackDescriptor(); + MCAPI NetworkItemStackDescriptor(class NetworkItemStackDescriptor const &); /** - * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@AEBVItemStackDescriptor\@\@\@Z + * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@XZ */ - MCAPI NetworkItemStackDescriptor(class ItemStackDescriptor const &); + MCAPI NetworkItemStackDescriptor(); /** * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI NetworkItemStackDescriptor(class NetworkItemStackDescriptor &&); - /** - * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI NetworkItemStackDescriptor(class NetworkItemStackDescriptor const &); /** * @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 */ diff --git a/LiteLoader/include/llapi/mc/NetworkPeer.hpp b/LiteLoader/include/llapi/mc/NetworkPeer.hpp index c988f2414f..7021371b5c 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\@CompressedNetworkPeer\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Reliability\@NetworkPeer\@\@W4Compressibility\@\@\@Z + * @symbol ?sendPacket\@BatchedNetworkPeer\@\@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\@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 + * @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 */ virtual enum class NetworkPeer::DataStatus receivePacket(std::string &, class std::shared_ptr>>> const &) = 0; /** * @vftbl 3 - * @symbol ?getNetworkStatus\@CompressedNetworkPeer\@\@UEBA?AUNetworkStatus\@NetworkPeer\@\@XZ + * @symbol ?getNetworkStatus\@BatchedNetworkPeer\@\@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 new file mode 100644 index 0000000000..934ba2af0b --- /dev/null +++ b/LiteLoader/include/llapi/mc/NetworkSession.hpp @@ -0,0 +1,36 @@ +/** + * @file NetworkSession.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class NetworkSession { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_NETWORKSESSION +public: + class NetworkSession& operator=(class NetworkSession const &) = delete; + NetworkSession(class NetworkSession const &) = delete; + NetworkSession() = delete; +#endif + +public: + /** + * @symbol ??0NetworkSession\@\@QEAA\@W4TransportLayer\@\@\@Z + */ + MCAPI NetworkSession(enum class TransportLayer); + /** + * @symbol ?getTransportLayer\@NetworkSession\@\@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 9ae1194722..1aa6672815 100644 --- a/LiteLoader/include/llapi/mc/NetworkSettingsPacket.hpp +++ b/LiteLoader/include/llapi/mc/NetworkSettingsPacket.hpp @@ -26,7 +26,6 @@ class NetworkSettingsPacket : public Packet { public: class NetworkSettingsPacket& operator=(class NetworkSettingsPacket const &) = delete; NetworkSettingsPacket(class NetworkSettingsPacket const &) = delete; - NetworkSettingsPacket() = delete; #endif public: @@ -52,14 +51,22 @@ class NetworkSettingsPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@NetworkSettingsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@NetworkSettingsPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETWORKSETTINGSPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~NetworkSettingsPacket(); #endif + /** + * @symbol ??0NetworkSettingsPacket\@\@QEAA\@AEBUNetworkSettingOptions\@\@\@Z + */ + MCAPI NetworkSettingsPacket(struct NetworkSettingOptions const &); + /** + * @symbol ??0NetworkSettingsPacket\@\@QEAA\@XZ + */ + MCAPI NetworkSettingsPacket(); }; diff --git a/LiteLoader/include/llapi/mc/NetworkStackLatencyPacket.hpp b/LiteLoader/include/llapi/mc/NetworkStackLatencyPacket.hpp index 72aa820a80..32046b8bf9 100644 --- a/LiteLoader/include/llapi/mc/NetworkStackLatencyPacket.hpp +++ b/LiteLoader/include/llapi/mc/NetworkStackLatencyPacket.hpp @@ -52,8 +52,8 @@ class NetworkStackLatencyPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@NetworkStackLatencyPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@NetworkStackLatencyPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/NetworkStatistics.hpp b/LiteLoader/include/llapi/mc/NetworkStatistics.hpp index fc2f19e1fc..69c3c56dfb 100644 --- a/LiteLoader/include/llapi/mc/NetworkStatistics.hpp +++ b/LiteLoader/include/llapi/mc/NetworkStatistics.hpp @@ -5,6 +5,8 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" +#include "RakNet.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -29,9 +31,61 @@ class NetworkStatistics { #endif public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?packetSentTo\@NetworkStatistics\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPacket\@\@I\@Z + */ + virtual void packetSentTo(class NetworkIdentifier const &, class Packet const &, unsigned int); + /** + * @vftbl 2 + * @symbol ?packetReceivedFrom\@NetworkStatistics\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPacket\@\@I\@Z + */ + virtual void packetReceivedFrom(class NetworkIdentifier const &, class Packet const &, unsigned int); + /** + * @vftbl 3 + * @symbol ?dataSentTo\@NetworkStatistics\@\@UEAAXAEBVNetworkIdentifier\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z + */ + virtual void dataSentTo(class NetworkIdentifier const &, class std::basic_string_view>); + /** + * @vftbl 4 + * @symbol ?dataReceivedFrom\@NetworkStatistics\@\@UEAAXAEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + virtual void dataReceivedFrom(class NetworkIdentifier const &, std::string const &); + /** + * @vftbl 5 + * @symbol ?reset\@NetworkStatistics\@\@UEAAXXZ + */ + virtual void reset(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETWORKSTATISTICS + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NetworkStatistics(); +#endif + /** + * @symbol ??0NetworkStatistics\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VNetworkSystem\@\@\@Bedrock\@\@\@gsl\@\@W4TrackerType\@\@$$QEAV?$function\@$$A6A_NAEAURakNetStatistics\@RakNet\@\@\@Z\@std\@\@V?$not_null\@V?$NonOwnerPointer\@VNetworkDebugManager\@\@\@Bedrock\@\@\@2\@\@Z + */ + MCAPI NetworkStatistics(class gsl::not_null>, enum class TrackerType, class std::function &&, class gsl::not_null>); /** * @symbol ?getVerboseInfo\@NetworkStatistics\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getVerboseInfo() const; +//private: + /** + * @symbol ?_clearCSVStats\@NetworkStatistics\@\@AEAAXXZ + */ + MCAPI void _clearCSVStats(); + /** + * @symbol ?_initRakNetProfileTracking\@NetworkStatistics\@\@AEAAXXZ + */ + MCAPI void _initRakNetProfileTracking(); + +private: + }; diff --git a/LiteLoader/include/llapi/mc/NetworkSystem.hpp b/LiteLoader/include/llapi/mc/NetworkSystem.hpp index cf61f59d34..cbf8e90d53 100644 --- a/LiteLoader/include/llapi/mc/NetworkSystem.hpp +++ b/LiteLoader/include/llapi/mc/NetworkSystem.hpp @@ -6,6 +6,7 @@ #define AUTO_GENERATED #include "llapi/Global.h" #include "Bedrock.hpp" +#include "RakNet.hpp" #define BEFORE_EXTRA @@ -15,7 +16,8 @@ class NetworkSystem { #define AFTER_EXTRA - +public: + struct Dependencies; #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_NETWORKSYSTEM public: @@ -34,6 +36,10 @@ 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 */ @@ -46,6 +52,10 @@ class NetworkSystem { * @symbol ?getDefaultGamePortv6\@NetworkSystem\@\@UEBAGXZ */ MCVAPI unsigned short getDefaultGamePortv6() const; + /** + * @symbol ?getTransportLayer\@NetworkSystem\@\@UEBA?AW4TransportLayer\@\@XZ + */ + MCVAPI enum class TransportLayer getTransportLayer() const; /** * @symbol ?onAllConnectionsClosed\@NetworkSystem\@\@EEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ @@ -128,9 +138,9 @@ class NetworkSystem { */ MCAPI class NetworkIdentifier getPrimaryNetworkId() const; /** - * @symbol ?getRemoteConnector\@NetworkSystem\@\@QEBA?AV?$NonOwnerPointer\@VRemoteConnector\@\@\@Bedrock\@\@XZ + * @symbol ?getRemoteConnector\@NetworkSystem\@\@QEAA?AV?$not_null\@V?$NonOwnerPointer\@VRemoteConnector\@\@\@Bedrock\@\@\@gsl\@\@XZ */ - MCAPI class Bedrock::NonOwnerPointer getRemoteConnector() const; + MCAPI class gsl::not_null> getRemoteConnector(); /** * @symbol ?getResourcePackUploadManager\@NetworkSystem\@\@QEAAAEAVResourcePackFileUploadManager\@\@AEAVPacketSender\@\@AEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ @@ -140,9 +150,9 @@ class NetworkSystem { */ MCAPI class NetworkIdentifier getServerId() const; /** - * @symbol ?getServerLocatorComposite\@NetworkSystem\@\@QEAAAEAVServerLocatorComposite\@\@XZ + * @symbol ?getServerLocator\@NetworkSystem\@\@QEAAAEAVServerLocator\@\@XZ */ - MCAPI class ServerLocatorComposite & getServerLocatorComposite(); + MCAPI class ServerLocator & getServerLocator(); /** * @symbol ?host\@NetworkSystem\@\@QEAA_NAEBUConnectionDefinition\@\@\@Z */ @@ -190,13 +200,13 @@ class NetworkSystem { //protected: /** - * @symbol ??0NetworkSystem\@\@IEAA\@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\@\@\@\@\@Z + * @symbol ??0NetworkSystem\@\@IEAA\@$$QEAUDependencies\@0\@\@Z */ - MCAPI NetworkSystem(class Scheduler &, std::vector const &, struct NetworkSystemToggles const &, class Bedrock::NonOwnerPointer const &, class ServiceReference); + MCAPI NetworkSystem(struct NetworkSystem::Dependencies &&); /** - * @symbol ??0NetworkSystem\@\@IEAA\@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\@\@\@\@AEBVNetherNetTransportFactory\@\@V?$NonOwnerPointer\@VAppPlatform\@\@\@6\@\@Z + * @symbol ?_createNetworkStatistics\@NetworkSystem\@\@IEAAXW4TrackerType\@\@$$QEAV?$function\@$$A6A_NAEAURakNetStatistics\@RakNet\@\@\@Z\@std\@\@$$QEAV?$not_null\@V?$NonOwnerPointer\@VNetworkDebugManager\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ - MCAPI NetworkSystem(class Scheduler &, std::vector const &, struct NetworkSystemToggles const &, class Bedrock::NonOwnerPointer const &, class ServiceReference, class NetherNetTransportFactory const &, class Bedrock::NonOwnerPointer); + MCAPI void _createNetworkStatistics(enum class TrackerType, class std::function &&, class gsl::not_null> &&); //private: /** @@ -207,18 +217,10 @@ class NetworkSystem { * @symbol ?_handlePacketViolation\@NetworkSystem\@\@AEAAXW4StreamReadResult\@\@W4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@AEBVNetworkIdentifier\@\@AEAVNetworkConnection\@\@W4SubClientId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void _handlePacketViolation(enum class StreamReadResult, enum class PacketViolationResponse, enum class MinecraftPacketIds, class NetworkIdentifier const &, class NetworkConnection &, enum class SubClientId, std::string const &); - /** - * @symbol ?_initializeRakNetConnector\@NetworkSystem\@\@AEAAXXZ - */ - MCAPI void _initializeRakNetConnector(); /** * @symbol ?_sendInternal\@NetworkSystem\@\@AEAAXAEBVNetworkIdentifier\@\@AEBVPacket\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void _sendInternal(class NetworkIdentifier const &, class Packet const &, std::string const &); - /** - * @symbol ?_setActiveTransportLayer\@NetworkSystem\@\@AEAAXXZ - */ - MCAPI void _setActiveTransportLayer(); /** * @symbol ?_sortAndPacketizeEvents\@NetworkSystem\@\@AEAA_NAEAVNetworkConnection\@\@V?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/NewLeafBlock.hpp b/LiteLoader/include/llapi/mc/NewLeafBlock.hpp deleted file mode 100644 index d6929507b3..0000000000 --- a/LiteLoader/include/llapi/mc/NewLeafBlock.hpp +++ /dev/null @@ -1,268 +0,0 @@ -/** - * @file NewLeafBlock.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "LeafBlock.hpp" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class NewLeafBlock. - * - */ -class NewLeafBlock : public LeafBlock { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_NEWLEAFBLOCK -public: - class NewLeafBlock& operator=(class NewLeafBlock const &) = delete; - NewLeafBlock(class NewLeafBlock const &) = delete; - NewLeafBlock() = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); - /** - * @vftbl 30 - * @symbol __unk_vfn_30 - */ - virtual void __unk_vfn_30(); - /** - * @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 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 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 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 60 - * @symbol __unk_vfn_60 - */ - virtual void __unk_vfn_60(); - /** - * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 75 - * @symbol __unk_vfn_75 - */ - virtual void __unk_vfn_75(); - /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 103 - * @symbol ?asItemInstance\@NewLeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z - */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; - /** - * @vftbl 105 - * @symbol __unk_vfn_105 - */ - virtual void __unk_vfn_105(); - /** - * @vftbl 123 - * @symbol __unk_vfn_123 - */ - virtual void __unk_vfn_123(); - /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 - */ - virtual void __unk_vfn_126(); - /** - * @vftbl 129 - * @symbol __unk_vfn_129 - */ - virtual void __unk_vfn_129(); - /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 - * @symbol ?buildDescriptionId\@NewLeafBlock\@\@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 135 - * @symbol ?isAuxValueRelevantForPicking\@NewLeafBlock\@\@UEBA_NXZ - */ - virtual bool isAuxValueRelevantForPicking() const; - /** - * @vftbl 147 - * @symbol ?getVariant\@NewLeafBlock\@\@UEBAHAEBVBlock\@\@\@Z - */ - virtual int getVariant(class Block const &) const; - /** - * @vftbl 157 - * @symbol __unk_vfn_157 - */ - virtual void __unk_vfn_157(); - /** - * @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 171 - * @symbol __unk_vfn_171 - */ - virtual void __unk_vfn_171(); - /** - * @vftbl 175 - * @symbol __unk_vfn_175 - */ - virtual void __unk_vfn_175(); - /** - * @vftbl 179 - * @symbol __unk_vfn_179 - */ - virtual void __unk_vfn_179(); - /** - * @vftbl 187 - * @symbol __unk_vfn_187 - */ - virtual void __unk_vfn_187(); - /** - * @vftbl 189 - * @symbol ?getResourceItem\@NewLeafBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z - */ - virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; - /** - * @vftbl 191 - * @symbol ?getSilkTouchItemInstance\@NewLeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z - */ - virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; - /** - * @vftbl 195 - * @symbol ?getExtraResourceItem\@NewLeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z - */ - virtual class ItemInstance getExtraResourceItem(class Block const &) const; - /** - * @symbol ??0NewLeafBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HV?$WeakPtr\@VBlockLegacy\@\@\@\@\@Z - */ - MCAPI NewLeafBlock(std::string const &, int, class WeakPtr); - -}; diff --git a/LiteLoader/include/llapi/mc/NewLeavesBlock.hpp b/LiteLoader/include/llapi/mc/NewLeavesBlock.hpp new file mode 100644 index 0000000000..40b9a56684 --- /dev/null +++ b/LiteLoader/include/llapi/mc/NewLeavesBlock.hpp @@ -0,0 +1,263 @@ +/** + * @file NewLeavesBlock.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "LeavesBlock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class NewLeavesBlock : public LeavesBlock { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_NEWLEAVESBLOCK +public: + class NewLeavesBlock& operator=(class NewLeavesBlock const &) = delete; + NewLeavesBlock(class NewLeavesBlock const &) = delete; + NewLeavesBlock() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + 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(); + /** + * @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 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 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 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @vftbl 59 + * @symbol __unk_vfn_59 + */ + virtual void __unk_vfn_59(); + /** + * @vftbl 60 + * @symbol __unk_vfn_60 + */ + virtual void __unk_vfn_60(); + /** + * @vftbl 74 + * @symbol __unk_vfn_74 + */ + virtual void __unk_vfn_74(); + /** + * @vftbl 81 + * @symbol __unk_vfn_81 + */ + virtual void __unk_vfn_81(); + /** + * @vftbl 102 + * @symbol ?asItemInstance\@NewLeavesBlock\@\@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 + */ + virtual void __unk_vfn_122(); + /** + * @vftbl 123 + * @symbol __unk_vfn_123 + */ + virtual void __unk_vfn_123(); + /** + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 + */ + virtual void __unk_vfn_127(); + /** + * @vftbl 130 + * @symbol __unk_vfn_130 + */ + virtual void __unk_vfn_130(); + /** + * @vftbl 132 + * @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 + * @symbol ?isAuxValueRelevantForPicking\@NewLeavesBlock\@\@UEBA_NXZ + */ + virtual bool isAuxValueRelevantForPicking() const; + /** + * @vftbl 145 + * @symbol ?getVariant\@NewLeavesBlock\@\@UEBAHAEBVBlock\@\@\@Z + */ + virtual int getVariant(class Block const &) const; + /** + * @vftbl 155 + * @symbol __unk_vfn_155 + */ + virtual void __unk_vfn_155(); + /** + * @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 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@NewLeavesBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + */ + virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + /** + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@NewLeavesBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + */ + virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; + /** + * @vftbl 194 + * @symbol ?getExtraResourceItem\@NewLeavesBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + */ + virtual class ItemInstance getExtraResourceItem(class Block const &) const; + /** + * @symbol ??0NewLeavesBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HV?$WeakPtr\@VBlockLegacy\@\@\@\@\@Z + */ + MCAPI NewLeavesBlock(std::string const &, int, class WeakPtr); + +}; diff --git a/LiteLoader/include/llapi/mc/NewLogBlock.hpp b/LiteLoader/include/llapi/mc/NewLogBlock.hpp index 7182164953..f66dabedce 100644 --- a/LiteLoader/include/llapi/mc/NewLogBlock.hpp +++ b/LiteLoader/include/llapi/mc/NewLogBlock.hpp @@ -40,16 +40,21 @@ class NewLogBlock : public LogBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class NewLogBlock : public LogBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class NewLogBlock : public LogBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,105 +131,100 @@ class NewLogBlock : public LogBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 f9ed3f376e..21568dc9b1 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?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 ?loadDirection\@NewUniqueIdsDataLoadHelper\@\@UEAA?AVVec3\@\@AEBV2\@\@Z + */ + MCVAPI class Vec3 loadDirection(class Vec3 const &); /** * @symbol ?loadFacingID\@NewUniqueIdsDataLoadHelper\@\@UEAAEE\@Z */ diff --git a/LiteLoader/include/llapi/mc/NoteBlock.hpp b/LiteLoader/include/llapi/mc/NoteBlock.hpp index cc908e7554..071d68bf0e 100644 --- a/LiteLoader/include/llapi/mc/NoteBlock.hpp +++ b/LiteLoader/include/llapi/mc/NoteBlock.hpp @@ -40,16 +40,21 @@ class NoteBlock : public ActorBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class NoteBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class NoteBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,90 +131,95 @@ class NoteBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 73 + * @vftbl 72 * @symbol ?onRedstoneUpdate\@NoteBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@NoteBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 109 + * @vftbl 108 * @symbol ?attack\@NoteBlock\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ virtual bool attack(class Player *, class BlockPos const &) const; /** - * @vftbl 116 + * @vftbl 115 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -217,44 +227,34 @@ class NoteBlock : public ActorBlock { 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 ?onPlace\@NoteBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@NoteBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NOTEBLOCK /** * @symbol ?isInteractiveBlock\@NoteBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/NpcDialoguePacket.hpp b/LiteLoader/include/llapi/mc/NpcDialoguePacket.hpp index e1d089e874..ed83c4feef 100644 --- a/LiteLoader/include/llapi/mc/NpcDialoguePacket.hpp +++ b/LiteLoader/include/llapi/mc/NpcDialoguePacket.hpp @@ -51,9 +51,9 @@ class NpcDialoguePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@NpcDialoguePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@NpcDialoguePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NPCDIALOGUEPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/NpcRequestPacket.hpp b/LiteLoader/include/llapi/mc/NpcRequestPacket.hpp index 78d77b873a..7fb0c10411 100644 --- a/LiteLoader/include/llapi/mc/NpcRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/NpcRequestPacket.hpp @@ -51,9 +51,9 @@ class NpcRequestPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@NpcRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@NpcRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NPCREQUESTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/NyliumBlock.hpp b/LiteLoader/include/llapi/mc/NyliumBlock.hpp index 00c5b9ef71..c7e0ceac77 100644 --- a/LiteLoader/include/llapi/mc/NyliumBlock.hpp +++ b/LiteLoader/include/llapi/mc/NyliumBlock.hpp @@ -40,16 +40,21 @@ class NyliumBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class NyliumBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class NyliumBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,122 +131,117 @@ class NyliumBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@NyliumBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@NyliumBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_169(); /** * @vftbl 171 - * @symbol __unk_vfn_171 - */ - virtual void __unk_vfn_171(); - /** - * @vftbl 173 * @symbol ?randomTick\@NyliumBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @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 ac0a4c388e..44f6d508b3 100644 --- a/LiteLoader/include/llapi/mc/ObserverBlock.hpp +++ b/LiteLoader/include/llapi/mc/ObserverBlock.hpp @@ -40,16 +40,21 @@ class ObserverBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class ObserverBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class ObserverBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,180 +131,175 @@ class ObserverBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 51 + * @vftbl 50 * @symbol ?isSignalSource\@ObserverBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_53(); /** - * @vftbl 55 + * @vftbl 54 * @symbol ?isValidAuxValue\@ObserverBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; + /** + * @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 64 + * @vftbl 63 * @symbol ?shouldConnectToRedstone\@ObserverBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 73 + * @vftbl 72 * @symbol ?onRedstoneUpdate\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 76 + * @vftbl 75 * @symbol ?movedByPiston\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void movedByPiston(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 101 * @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 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @symbol ?getPlacementBlock\@ObserverBlock\@\@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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@ObserverBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?getMappedFace\@ObserverBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 151 + * @vftbl 149 * @symbol ?getFaceFlip\@ObserverBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z */ virtual enum class Flip getFaceFlip(unsigned char, class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #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 4bc6f55e74..c6e0be0d43 100644 --- a/LiteLoader/include/llapi/mc/ObsidianBlock.hpp +++ b/LiteLoader/include/llapi/mc/ObsidianBlock.hpp @@ -40,16 +40,21 @@ class ObsidianBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class ObsidianBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class ObsidianBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,115 +131,110 @@ class ObsidianBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@ObsidianBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 162 + * @vftbl 160 * @symbol ?_addHardCodedBlockComponents\@ObsidianBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 83f7e128ba..480a22debf 100644 --- a/LiteLoader/include/llapi/mc/Ocelot.hpp +++ b/LiteLoader/include/llapi/mc/Ocelot.hpp @@ -37,135 +37,130 @@ class Ocelot : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 - */ - virtual void __unk_vfn_243(); - /** - * @vftbl 258 + * @vftbl 250 * @symbol ?updateEntitySpecificMolangVariables\@Ocelot\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); + /** + * @vftbl 252 + * @symbol __unk_vfn_252 + */ + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); - /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 347 + * @vftbl 339 * @symbol ?_serverAiMobStep\@Ocelot\@\@UEAAXXZ */ virtual void _serverAiMobStep(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0Ocelot\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/OldLeafBlock.hpp b/LiteLoader/include/llapi/mc/OldLeavesBlock.hpp similarity index 50% rename from LiteLoader/include/llapi/mc/OldLeafBlock.hpp rename to LiteLoader/include/llapi/mc/OldLeavesBlock.hpp index 0cc67f7d77..719a1792d5 100644 --- a/LiteLoader/include/llapi/mc/OldLeafBlock.hpp +++ b/LiteLoader/include/llapi/mc/OldLeavesBlock.hpp @@ -1,32 +1,27 @@ /** - * @file OldLeafBlock.hpp + * @file OldLeavesBlock.hpp * */ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "LeafBlock.hpp" +#include "LeavesBlock.hpp" #define BEFORE_EXTRA -// Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC class OldLeafBlock. - * - */ -class OldLeafBlock : public LeafBlock { + +class OldLeavesBlock : public LeavesBlock { #define AFTER_EXTRA -// Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_OLDLEAFBLOCK +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_OLDLEAVESBLOCK public: - class OldLeafBlock& operator=(class OldLeafBlock const &) = delete; - OldLeafBlock(class OldLeafBlock const &) = delete; - OldLeafBlock() = delete; + class OldLeavesBlock& operator=(class OldLeavesBlock const &) = delete; + OldLeavesBlock(class OldLeavesBlock const &) = delete; + OldLeavesBlock() = delete; #endif public: @@ -40,16 +35,21 @@ class OldLeafBlock : public LeafBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +61,10 @@ class OldLeafBlock : public LeafBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +96,10 @@ class OldLeafBlock : public LeafBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,158 +126,153 @@ class OldLeafBlock : public LeafBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 102 + * @symbol ?asItemInstance\@OldLeavesBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ - virtual void __unk_vfn_82(); + virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@OldLeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 - * @symbol ?buildDescriptionId\@OldLeafBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @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 135 - * @symbol ?isAuxValueRelevantForPicking\@OldLeafBlock\@\@UEBA_NXZ + * @vftbl 133 + * @symbol ?isAuxValueRelevantForPicking\@OldLeavesBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 137 - * @symbol ?getColor\@OldLeafBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 135 + * @symbol ?getColor\@OldLeavesBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 147 - * @symbol ?getVariant\@OldLeafBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 145 + * @symbol ?getVariant\@OldLeavesBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 182 - * @symbol ?getRenderLayer\@OldLeafBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 180 + * @symbol ?getRenderLayer\@OldLeavesBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol ?getMapColor\@OldLeafBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 185 + * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 - * @symbol ?getResourceItem\@OldLeafBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@OldLeavesBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 - * @symbol ?getSilkTouchItemInstance\@OldLeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@OldLeavesBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 195 - * @symbol ?getExtraResourceItem\@OldLeafBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 194 + * @symbol ?getExtraResourceItem\@OldLeavesBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getExtraResourceItem(class Block const &) const; /** - * @symbol ??0OldLeafBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HV?$WeakPtr\@VBlockLegacy\@\@\@\@\@Z + * @symbol ??0OldLeavesBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HV?$WeakPtr\@VBlockLegacy\@\@\@\@\@Z */ - MCAPI OldLeafBlock(std::string const &, int, class WeakPtr); + MCAPI OldLeavesBlock(std::string const &, int, class WeakPtr); }; diff --git a/LiteLoader/include/llapi/mc/OldLogBlock.hpp b/LiteLoader/include/llapi/mc/OldLogBlock.hpp index 540b82c8f4..91fb9db0f3 100644 --- a/LiteLoader/include/llapi/mc/OldLogBlock.hpp +++ b/LiteLoader/include/llapi/mc/OldLogBlock.hpp @@ -40,16 +40,21 @@ class OldLogBlock : public LogBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class OldLogBlock : public LogBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class OldLogBlock : public LogBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,105 +131,100 @@ class OldLogBlock : public LogBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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/OnFallOnTriggerDescription.hpp b/LiteLoader/include/llapi/mc/OnFallOnTriggerDescription.hpp index e2ed60ac98..6b15ddbae0 100644 --- a/LiteLoader/include/llapi/mc/OnFallOnTriggerDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnFallOnTriggerDescription.hpp @@ -47,6 +47,11 @@ class OnFallOnTriggerDescription { virtual void initializeComponent(class EntityContext &) const; /** * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 * @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/OnInteractTriggerDescription.hpp b/LiteLoader/include/llapi/mc/OnInteractTriggerDescription.hpp index 485fe9d3ae..a63b21b068 100644 --- a/LiteLoader/include/llapi/mc/OnInteractTriggerDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnInteractTriggerDescription.hpp @@ -41,17 +41,22 @@ class OnInteractTriggerDescription { */ virtual std::string const & getName() const; /** - * @vftbl 4 + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 5 * @symbol ?isNetworkComponent\@OnInteractTriggerDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 + * @vftbl 6 * @symbol ?buildNetworkTag\@OnInteractTriggerDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?initializeFromNetwork\@OnInteractTriggerDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/OnPlacedTriggerDescription.hpp b/LiteLoader/include/llapi/mc/OnPlacedTriggerDescription.hpp index d468fcc6db..8a739a8f50 100644 --- a/LiteLoader/include/llapi/mc/OnPlacedTriggerDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnPlacedTriggerDescription.hpp @@ -40,6 +40,11 @@ class OnPlacedTriggerDescription { * @symbol ?getName\@OnPlacedTriggerDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; + /** + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); /** * @symbol ?NameID\@OnPlacedTriggerDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ diff --git a/LiteLoader/include/llapi/mc/OnPlayerDestroyedTriggerDescription.hpp b/LiteLoader/include/llapi/mc/OnPlayerDestroyedTriggerDescription.hpp index b02a682353..233b02a346 100644 --- a/LiteLoader/include/llapi/mc/OnPlayerDestroyedTriggerDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnPlayerDestroyedTriggerDescription.hpp @@ -40,6 +40,11 @@ class OnPlayerDestroyedTriggerDescription { * @symbol ?getName\@OnPlayerDestroyedTriggerDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; + /** + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); /** * @symbol ?NameID\@OnPlayerDestroyedTriggerDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ diff --git a/LiteLoader/include/llapi/mc/OnPlayerPlacingTriggerDescription.hpp b/LiteLoader/include/llapi/mc/OnPlayerPlacingTriggerDescription.hpp index de1ce6a77a..e5cb356a07 100644 --- a/LiteLoader/include/llapi/mc/OnPlayerPlacingTriggerDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnPlayerPlacingTriggerDescription.hpp @@ -41,17 +41,22 @@ class OnPlayerPlacingTriggerDescription { */ virtual std::string const & getName() const; /** - * @vftbl 4 + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 5 * @symbol ?isNetworkComponent\@OnPlayerPlacingTriggerDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 + * @vftbl 6 * @symbol ?buildNetworkTag\@OnPlayerPlacingTriggerDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 7 * @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 6ab6cda7e2..eb3ce3b911 100644 --- a/LiteLoader/include/llapi/mc/OnScreenTextureAnimationPacket.hpp +++ b/LiteLoader/include/llapi/mc/OnScreenTextureAnimationPacket.hpp @@ -51,9 +51,9 @@ class OnScreenTextureAnimationPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@OnScreenTextureAnimationPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@OnScreenTextureAnimationPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ONSCREENTEXTUREANIMATIONPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/OnStepOffTriggerDescription.hpp b/LiteLoader/include/llapi/mc/OnStepOffTriggerDescription.hpp index 8f146d3c97..919550724a 100644 --- a/LiteLoader/include/llapi/mc/OnStepOffTriggerDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnStepOffTriggerDescription.hpp @@ -40,6 +40,11 @@ class OnStepOffTriggerDescription { * @symbol ?getName\@OnStepOffTriggerDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; + /** + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); /** * @symbol ?NameID\@OnStepOffTriggerDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ diff --git a/LiteLoader/include/llapi/mc/OnStepOnTriggerDescription.hpp b/LiteLoader/include/llapi/mc/OnStepOnTriggerDescription.hpp index 71e6291461..a449c6dcc5 100644 --- a/LiteLoader/include/llapi/mc/OnStepOnTriggerDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnStepOnTriggerDescription.hpp @@ -40,6 +40,11 @@ class OnStepOnTriggerDescription { * @symbol ?getName\@OnStepOnTriggerDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; + /** + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); /** * @symbol ?NameID\@OnStepOnTriggerDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ diff --git a/LiteLoader/include/llapi/mc/OnUseItemComponent.hpp b/LiteLoader/include/llapi/mc/OnUseItemComponent.hpp index 919ef38464..b32a025fe3 100644 --- a/LiteLoader/include/llapi/mc/OnUseItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/OnUseItemComponent.hpp @@ -51,16 +51,11 @@ class OnUseItemComponent { virtual void __unk_vfn_3(); /** * @vftbl 4 - * @symbol __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 * @symbol ?buildNetworkTag\@?$NetworkedItemComponent\@VOnUseItemComponent\@\@\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 5 * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VOnUseItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/OnUseOnItemComponent.hpp b/LiteLoader/include/llapi/mc/OnUseOnItemComponent.hpp index 716cf8f283..cd3b3124b0 100644 --- a/LiteLoader/include/llapi/mc/OnUseOnItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/OnUseOnItemComponent.hpp @@ -36,9 +36,9 @@ class OnUseOnItemComponent { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VOnUseOnItemComponent\@\@\@\@UEBA_NXZ + * @symbol __unk_vfn_1 */ - virtual bool isNetworkComponent() const; + virtual void __unk_vfn_1(); /** * @vftbl 2 * @symbol __unk_vfn_2 @@ -46,24 +46,40 @@ class OnUseOnItemComponent { virtual void __unk_vfn_2(); /** * @vftbl 3 - * @symbol ?useOn\@OnUseOnItemComponent\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol __unk_vfn_3 */ - virtual bool useOn(class ItemStack &, class Actor &, class BlockPos const &, unsigned char, class Vec3 const &) const; + virtual void __unk_vfn_3(); /** * @vftbl 4 - * @symbol __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 * @symbol ?buildNetworkTag\@?$NetworkedItemComponent\@VOnUseOnItemComponent\@\@\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 5 * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VOnUseOnItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); + /** + * @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 ?_useOn\@OnUseOnItemComponent\@\@MEBA_NAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@\@Z + */ + virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos const &, unsigned char, class Vec3 const &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ONUSEONITEMCOMPONENT + /** + * @symbol ?_canUseOn\@OnUseOnItemComponent\@\@MEBA_NAEBVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@E\@Z + */ + MCVAPI bool _canUseOn(class ItemStack const &, class Actor &, class BlockPos const &, unsigned char) const; +#endif /** * @symbol ?bindType\@OnUseOnItemComponent\@\@SAXXZ */ diff --git a/LiteLoader/include/llapi/mc/OpenSignPacket.hpp b/LiteLoader/include/llapi/mc/OpenSignPacket.hpp index 96730bd27a..cf96568675 100644 --- a/LiteLoader/include/llapi/mc/OpenSignPacket.hpp +++ b/LiteLoader/include/llapi/mc/OpenSignPacket.hpp @@ -46,22 +46,22 @@ class OpenSignPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@OpenSignPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@OpenSignPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_OPENSIGNPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~OpenSignPacket(); #endif - /** - * @symbol ??0OpenSignPacket\@\@QEAA\@AEBVBlockPos\@\@_N\@Z - */ - MCAPI OpenSignPacket(class BlockPos const &, bool); /** * @symbol ??0OpenSignPacket\@\@QEAA\@XZ */ MCAPI OpenSignPacket(); + /** + * @symbol ??0OpenSignPacket\@\@QEAA\@AEBVBlockPos\@\@_N\@Z + */ + MCAPI OpenSignPacket(class BlockPos const &, bool); }; diff --git a/LiteLoader/include/llapi/mc/OreBlock.hpp b/LiteLoader/include/llapi/mc/OreBlock.hpp index f96c61b13a..29bce7ec8a 100644 --- a/LiteLoader/include/llapi/mc/OreBlock.hpp +++ b/LiteLoader/include/llapi/mc/OreBlock.hpp @@ -40,16 +40,21 @@ class OreBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class OreBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class OreBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,122 +131,117 @@ class OreBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 52 + * @vftbl 51 * @symbol ?canBeOriginalSurface\@OreBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_53(); + /** + * @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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 102 + * @vftbl 101 * @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 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_169(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_173(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_177(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 - */ - virtual void __unk_vfn_187(); - /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@OreBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@OreBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/OverworldGeneratorVoid.hpp b/LiteLoader/include/llapi/mc/OverworldGeneratorVoid.hpp deleted file mode 100644 index 2c9f4dfdb5..0000000000 --- a/LiteLoader/include/llapi/mc/OverworldGeneratorVoid.hpp +++ /dev/null @@ -1,77 +0,0 @@ -/** - * @file OverworldGeneratorVoid.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class OverworldGeneratorVoid. - * - */ -class OverworldGeneratorVoid { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_OVERWORLDGENERATORVOID -public: - class OverworldGeneratorVoid& operator=(class OverworldGeneratorVoid const &) = delete; - OverworldGeneratorVoid(class OverworldGeneratorVoid const &) = delete; - OverworldGeneratorVoid() = delete; -#endif - -public: -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_OVERWORLDGENERATORVOID - /** - * @symbol ?_prepareHeights\@OverworldGeneratorVoid\@\@EEAAXAEAVBlockVolume\@\@AEBVChunkPos\@\@AEBVWorldGenCache\@\@PEAVAquifer\@\@$$QEAV?$function\@$$A6AXAEBVBlockPos\@\@AEBVBlock\@\@H\@Z\@std\@\@_NPEAV?$vector\@FV?$allocator\@F\@std\@\@\@7\@H\@Z - */ - MCVAPI void _prepareHeights(class BlockVolume &, class ChunkPos const &, class WorldGenCache const &, class Aquifer *, class std::function &&, bool, std::vector *, int); - /** - * @symbol ?decorateWorldGenPostProcess\@OverworldGeneratorVoid\@\@EEBAXAEAVBiome\@\@AEAVLevelChunk\@\@AEAVBlockSource\@\@AEAVRandom\@\@\@Z - */ - MCVAPI void decorateWorldGenPostProcess(class Biome &, class LevelChunk &, class BlockSource &, class Random &) const; - /** - * @symbol ?findSpawnPosition\@OverworldGeneratorVoid\@\@UEBA?AVBlockPos\@\@XZ - */ - MCVAPI class BlockPos findSpawnPosition() const; - /** - * @symbol ?generateDensityCellsForChunk\@OverworldGeneratorVoid\@\@UEBA?AV?$MultidimensionalArray\@M$04$04$0CJ\@\@Util\@\@AEBVChunkPos\@\@\@Z - */ - MCVAPI class Util::MultidimensionalArray generateDensityCellsForChunk(class ChunkPos const &) const; - /** - * @symbol ?getBiomeSource\@OverworldGeneratorVoid\@\@UEBAAEBVBiomeSource\@\@XZ - */ - MCVAPI class BiomeSource const & getBiomeSource() const; - /** - * @symbol ?getLevelGenHeight\@OverworldGeneratorVoid\@\@UEBAHXZ - */ - MCVAPI int getLevelGenHeight() const; - /** - * @symbol ?getMaterialAdjNoise\@OverworldGeneratorVoid\@\@UEBAAEBV?$unique_ptr\@VPerlinSimplexNoise\@\@U?$default_delete\@VPerlinSimplexNoise\@\@\@std\@\@\@std\@\@XZ - */ - MCVAPI std::unique_ptr const & getMaterialAdjNoise() const; - /** - * @symbol ?getSurfaceNoise\@OverworldGeneratorVoid\@\@UEAAAEBVPerlinSimplexNoise\@\@XZ - */ - MCVAPI class PerlinSimplexNoise const & getSurfaceNoise(); - /** - * @symbol ?getXoroshiroPositionalRandomFactory\@OverworldGeneratorVoid\@\@UEBA?AV?$optional\@VXoroshiroPositionalRandomFactory\@\@\@std\@\@XZ - */ - MCVAPI class std::optional getXoroshiroPositionalRandomFactory() const; - /** - * @symbol ?loadChunk\@OverworldGeneratorVoid\@\@UEAAXAEAVLevelChunk\@\@_N\@Z - */ - MCVAPI void loadChunk(class LevelChunk &, bool); -#endif - /** - * @symbol ??0OverworldGeneratorVoid\@\@QEAA\@AEAVDimension\@\@I\@Z - */ - MCAPI OverworldGeneratorVoid(class Dimension &, unsigned int); - -}; diff --git a/LiteLoader/include/llapi/mc/PackAccessStrategy.hpp b/LiteLoader/include/llapi/mc/PackAccessStrategy.hpp index de569ad0d1..665adb17e0 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\@ZipPackAccessStrategy\@\@UEBA_KXZ + * @symbol ?getPackSize\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_KXZ */ virtual unsigned __int64 getPackSize() const = 0; /** * @vftbl 2 - * @symbol ?getPackLocation\@ZipPackAccessStrategy\@\@UEBAAEBVResourceLocation\@\@XZ + * @symbol ?getPackLocation\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBAAEBVResourceLocation\@\@XZ */ virtual class ResourceLocation const & getPackLocation() const = 0; /** * @vftbl 3 - * @symbol ?getPackName\@ZipPackAccessStrategy\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getPackName\@DirectoryPackWithEncryptionAccessStrategy\@\@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\@ZipPackAccessStrategy\@\@UEBA_NXZ + * @symbol ?isWritable\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NXZ */ virtual bool isWritable() const = 0; /** * @vftbl 5 - * @symbol ?setIsTrusted\@ZipPackAccessStrategy\@\@UEAAX_N\@Z + * @symbol ?setIsTrusted\@DirectoryPackWithEncryptionAccessStrategy\@\@UEAAX_N\@Z */ virtual void setIsTrusted(bool) = 0; /** * @vftbl 6 - * @symbol ?isTrusted\@ZipPackAccessStrategy\@\@UEBA_NXZ + * @symbol ?isTrusted\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NXZ */ virtual bool isTrusted() const = 0; /** * @vftbl 7 - * @symbol ?hasAsset\@ZipPackAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@_N1\@Z + * @symbol ?hasAsset\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@_N1\@Z */ virtual bool hasAsset(class Core::Path const &, bool, bool) const = 0; /** * @vftbl 8 - * @symbol ?hasFolder\@ZipPackAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@\@Z + * @symbol ?hasFolder\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@\@Z */ virtual bool hasFolder(class Core::Path const &) const = 0; /** * @vftbl 9 - * @symbol ?getAsset\@ZipPackAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?getAsset\@DirectoryPackWithEncryptionAccessStrategy\@\@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\@ZipPackAccessStrategy\@\@UEAA_NAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@Z + * @symbol ?deleteAsset\@DirectoryPackWithEncryptionAccessStrategy\@\@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\@ZipPackAccessStrategy\@\@UEAA_NAEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?writeAsset\@DirectoryPackWithEncryptionAccessStrategy\@\@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\@ZipPackAccessStrategy\@\@UEBAXAEBVPath\@Core\@\@V?$function\@$$A6AXAEBVPath\@Core\@\@\@Z\@std\@\@_N\@Z + * @symbol ?forEachIn\@DirectoryPackWithEncryptionAccessStrategy\@\@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\@ZipPackAccessStrategy\@\@UEBA?AV?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@std\@\@AEBVPath\@Core\@\@\@Z + * @symbol ?createSubPack\@DirectoryPackWithEncryptionAccessStrategy\@\@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\@ZipPackAccessStrategy\@\@UEAAXXZ + * @symbol ?unload\@DirectoryPackWithEncryptionAccessStrategy\@\@UEAAXXZ */ virtual void unload() = 0; /** diff --git a/LiteLoader/include/llapi/mc/PackIdVersion.hpp b/LiteLoader/include/llapi/mc/PackIdVersion.hpp index 727b58740a..080f26dfb2 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\@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\@AEBVUUID\@mce\@\@AEBVSemVersion\@\@W4PackType\@\@\@Z + */ + MCAPI PackIdVersion(class mce::UUID const &, class SemVersion const &, enum class PackType); /** * @symbol ??0PackIdVersion\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/PackInstance.hpp b/LiteLoader/include/llapi/mc/PackInstance.hpp index 20a8d4ce7f..306c4893ec 100644 --- a/LiteLoader/include/llapi/mc/PackInstance.hpp +++ b/LiteLoader/include/llapi/mc/PackInstance.hpp @@ -5,8 +5,8 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Core.hpp" #include "Bedrock.hpp" +#include "Core.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -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\@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 ??0PackInstance\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI PackInstance(class PackInstance const &); /** * @symbol ?forEachIn\@PackInstance\@\@QEBAXAEBVPath\@Core\@\@V?$function\@$$A6AXAEBVPath\@Core\@\@\@Z\@std\@\@_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/PackInstanceId.hpp b/LiteLoader/include/llapi/mc/PackInstanceId.hpp index e8c6ba3c27..0f230a10e6 100644 --- a/LiteLoader/include/llapi/mc/PackInstanceId.hpp +++ b/LiteLoader/include/llapi/mc/PackInstanceId.hpp @@ -27,14 +27,14 @@ struct PackInstanceId { #endif public: - /** - * @symbol ??0PackInstanceId\@\@QEAA\@$$QEAU0\@\@Z - */ - MCAPI PackInstanceId(struct PackInstanceId &&); /** * @symbol ??0PackInstanceId\@\@QEAA\@AEBUPackIdVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI PackInstanceId(struct PackIdVersion const &, std::string const &); + /** + * @symbol ??0PackInstanceId\@\@QEAA\@$$QEAU0\@\@Z + */ + MCAPI PackInstanceId(struct PackInstanceId &&); /** * @symbol ??1PackInstanceId\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/PackReport.hpp b/LiteLoader/include/llapi/mc/PackReport.hpp index fdcd294c3b..d6a6e74cdc 100644 --- a/LiteLoader/include/llapi/mc/PackReport.hpp +++ b/LiteLoader/include/llapi/mc/PackReport.hpp @@ -28,18 +28,22 @@ class PackReport { #endif public: - /** - * @symbol ??0PackReport\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI PackReport(class PackReport const &); /** * @symbol ??0PackReport\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI PackReport(class PackReport &&); + /** + * @symbol ??0PackReport\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI PackReport(class PackReport const &); /** * @symbol ??0PackReport\@\@QEAA\@XZ */ MCAPI PackReport(); + /** + * @symbol ?getErrors\@PackReport\@\@QEBAAEBV?$vector\@V?$shared_ptr\@VPackError\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VPackError\@\@\@std\@\@\@2\@\@std\@\@XZ + */ + MCAPI std::vector> const & getErrors() const; /** * @symbol ?getIdentity\@PackReport\@\@QEBAAEBUPackIdVersion\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/PackSourceReport.hpp b/LiteLoader/include/llapi/mc/PackSourceReport.hpp index 8fb20866cf..8693dc040f 100644 --- a/LiteLoader/include/llapi/mc/PackSourceReport.hpp +++ b/LiteLoader/include/llapi/mc/PackSourceReport.hpp @@ -27,14 +27,14 @@ class PackSourceReport { #endif public: - /** - * @symbol ??0PackSourceReport\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI PackSourceReport(class PackSourceReport const &); /** * @symbol ??0PackSourceReport\@\@QEAA\@XZ */ MCAPI PackSourceReport(); + /** + * @symbol ??0PackSourceReport\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI PackSourceReport(class PackSourceReport const &); /** * @symbol ?addReport\@PackSourceReport\@\@QEAAXAEBUPackIdVersion\@\@$$QEAVPackReport\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/Packet.hpp b/LiteLoader/include/llapi/mc/Packet.hpp index aceb8185da..b54bbf3262 100644 --- a/LiteLoader/include/llapi/mc/Packet.hpp +++ b/LiteLoader/include/llapi/mc/Packet.hpp @@ -49,10 +49,10 @@ class Packet { { return handler->getServerPlayer(*netId, dAccess(this, 16)); } - inline StreamReadResult read(class ReadOnlyBinaryStream& binaryStream) - { - return _read(binaryStream); - } + //inline StreamReadResult read(class ReadOnlyBinaryStream& binaryStream) + //{ + // return _read(binaryStream); + //} protected: std::string toDebugString() { return fmt::format("{}({})->{}", getName(), getId(), clientSubId); @@ -89,9 +89,9 @@ class Packet { virtual void write(class BinaryStream &) const = 0; /** * @vftbl 4 - * @symbol ?readExtended\@Packet\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@Packet\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult read(class ReadOnlyBinaryStream &); /** * @vftbl 5 * @symbol ?disallowBatching\@Packet\@\@UEBA_NXZ @@ -104,9 +104,9 @@ class Packet { virtual bool isValid() const; /** * @vftbl 7 - * @symbol ?_read\@CreatePhotoPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CreatePhotoPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &) = 0; + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &) = 0; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/PacketObserver.hpp b/LiteLoader/include/llapi/mc/PacketObserver.hpp index f66634f92a..7185a59c60 100644 --- a/LiteLoader/include/llapi/mc/PacketObserver.hpp +++ b/LiteLoader/include/llapi/mc/PacketObserver.hpp @@ -68,6 +68,10 @@ class PacketObserver { * @symbol ?dataSentTo\@PacketObserver\@\@UEAAXAEBVNetworkIdentifier\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ MCVAPI void dataSentTo(class NetworkIdentifier const &, class std::basic_string_view>); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PacketObserver(); #endif }; diff --git a/LiteLoader/include/llapi/mc/PacketViolationWarningPacket.hpp b/LiteLoader/include/llapi/mc/PacketViolationWarningPacket.hpp index 1bf7e1e2fa..634c256b1a 100644 --- a/LiteLoader/include/llapi/mc/PacketViolationWarningPacket.hpp +++ b/LiteLoader/include/llapi/mc/PacketViolationWarningPacket.hpp @@ -51,9 +51,9 @@ class PacketViolationWarningPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PacketViolationWarningPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PacketViolationWarningPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PACKETVIOLATIONWARNINGPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/Painting.hpp b/LiteLoader/include/llapi/mc/Painting.hpp index abce8718e5..951b714528 100644 --- a/LiteLoader/include/llapi/mc/Painting.hpp +++ b/LiteLoader/include/llapi/mc/Painting.hpp @@ -42,157 +42,147 @@ class Painting : public HangingActor { */ virtual void remove(); /** - * @vftbl 20 - * @symbol ?setPos\@Painting\@\@UEAAXAEBVVec3\@\@\@Z + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void setPos(class Vec3 const &); + virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 - */ - virtual void __unk_vfn_41(); - /** - * @vftbl 48 + * @vftbl 47 * @symbol ?tryCreateAddActorPacket\@Painting\@\@UEAA?AV?$unique_ptr\@VAddActorBasePacket\@\@U?$default_delete\@VAddActorBasePacket\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr tryCreateAddActorPacket(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 80 + * @vftbl 78 * @symbol ?getShadowRadius\@Painting\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_80(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_86(); /** - * @vftbl 95 + * @vftbl 93 * @symbol ?isPickable\@Painting\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 + */ + virtual void __unk_vfn_94(); + /** + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 - */ - virtual void __unk_vfn_260(); - /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@Painting\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@Painting\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 277 + * @vftbl 269 * @symbol ?getWidth\@Painting\@\@UEBAHXZ */ virtual int getWidth() const; /** - * @vftbl 278 + * @vftbl 270 * @symbol ?getHeight\@Painting\@\@UEBAHXZ */ virtual int getHeight() const; /** - * @vftbl 279 + * @vftbl 271 * @symbol ?dropItem\@Painting\@\@UEAAXXZ */ virtual void dropItem(); /** - * @vftbl 280 + * @vftbl 272 * @symbol ?placeHangingEntity\@Painting\@\@UEAA_NAEAVBlockSource\@\@H\@Z */ virtual bool placeHangingEntity(class BlockSource &, int); diff --git a/LiteLoader/include/llapi/mc/PaintingUpdatePositionSystem.hpp b/LiteLoader/include/llapi/mc/PaintingUpdatePositionSystem.hpp deleted file mode 100644 index b6b9a4bc5c..0000000000 --- a/LiteLoader/include/llapi/mc/PaintingUpdatePositionSystem.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file PaintingUpdatePositionSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class PaintingUpdatePositionSystem. - * - */ -class PaintingUpdatePositionSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PAINTINGUPDATEPOSITIONSYSTEM -public: - class PaintingUpdatePositionSystem& operator=(class PaintingUpdatePositionSystem const &) = delete; - PaintingUpdatePositionSystem(class PaintingUpdatePositionSystem const &) = delete; - PaintingUpdatePositionSystem() = delete; -#endif - -public: - /** - * @symbol ?createPaintingUpdatePositionSystem\@PaintingUpdatePositionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createPaintingUpdatePositionSystem(); - -}; diff --git a/LiteLoader/include/llapi/mc/Panda.hpp b/LiteLoader/include/llapi/mc/Panda.hpp index 9294766f66..4a2a51c828 100644 --- a/LiteLoader/include/llapi/mc/Panda.hpp +++ b/LiteLoader/include/llapi/mc/Panda.hpp @@ -37,145 +37,140 @@ class Panda : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 133 + * @vftbl 131 * @symbol ?getAmbientSound\@Panda\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getAmbientSound() const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@Panda\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 274 + * @vftbl 266 * @symbol ?_onSizeUpdated\@Panda\@\@UEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 334 + * @vftbl 326 * @symbol ?setTransitioningSitting\@Panda\@\@UEAAX_N\@Z */ virtual void setTransitioningSitting(bool); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0Panda\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/Parrot.hpp b/LiteLoader/include/llapi/mc/Parrot.hpp index 2cd2cd557d..9240faf1dc 100644 --- a/LiteLoader/include/llapi/mc/Parrot.hpp +++ b/LiteLoader/include/llapi/mc/Parrot.hpp @@ -42,170 +42,165 @@ class Parrot : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 80 + * @vftbl 78 * @symbol ?getShadowRadius\@Parrot\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 120 + * @vftbl 118 * @symbol ?setSitting\@Parrot\@\@UEAAX_N\@Z */ virtual void setSitting(bool); /** - * @vftbl 130 + * @vftbl 128 * @symbol ?vehicleLanded\@Parrot\@\@UEAAXAEBVVec3\@\@0\@Z */ virtual void vehicleLanded(class Vec3 const &, class Vec3 const &); /** - * @vftbl 132 + * @vftbl 130 * @symbol ?playAmbientSound\@Parrot\@\@UEAAXXZ */ virtual void playAmbientSound(); /** - * @vftbl 133 + * @vftbl 131 * @symbol ?getAmbientSound\@Parrot\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getAmbientSound() const; /** - * @vftbl 134 + * @vftbl 132 * @symbol ?isInvulnerableTo\@Parrot\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 190 + * @vftbl 188 * @symbol ?canBePulledIntoVehicle\@Parrot\@\@UEBA_NXZ */ virtual bool canBePulledIntoVehicle() const; /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 266 + * @vftbl 258 * @symbol ?_playStepSound\@Parrot\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 337 + * @vftbl 329 * @symbol ?_getWalkTargetValue\@Parrot\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); #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 78a1d1c2e0..e3815015aa 100644 --- a/LiteLoader/include/llapi/mc/Parser.hpp +++ b/LiteLoader/include/llapi/mc/Parser.hpp @@ -31,17 +31,13 @@ class Parser { public: /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAUActorDefinitionIdentifier\@\@PEBD3\@Z - */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, struct ActorDefinitionIdentifier &, char const *, char const *); - /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVBlockDescriptor\@\@\@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 &, class BlockDescriptor &); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::string &, char const *, char const *); /** - * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVItemDescriptor\@\@\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV23\@PEBD\@Z */ - MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class ItemDescriptor &); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, class Json::Value &, char const *); /** * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAMPEBDM\@Z */ @@ -51,113 +47,121 @@ class Parser { */ MCAPI static bool parse(class Json::Value const &, class SemVersion const &, enum class FilterSubject &, char const *, char const *); /** - * @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\@\@AEAVVec3\@\@PEBDAEBV5\@\@Z - */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, class Vec3 &, char const *, class Vec3 const &); - /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV23\@PEBD\@Z + * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVItemDescriptor\@\@\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, class Json::Value &, char const *); + MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class ItemDescriptor &); /** * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAEE\@Z */ MCAPI static void parse(class Json::Value const &, class SemVersion const &, unsigned char &, unsigned char); /** - * @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\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVHashedString\@\@PEBD3\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAHPEBDH\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, class HashedString &, char const *, char const *); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, int &, char const *, int); /** * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAIPEBDI\@Z */ MCAPI static void parse(class Json::Value const &, class SemVersion const &, unsigned int &, char const *, unsigned int); /** - * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVActorDefinitionTrigger\@\@PEBD\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVHashedString\@\@PEBD3\@Z */ - MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class ActorDefinitionTrigger &, char const *); + 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\@\@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 + * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VItemDescriptor\@\@V?$allocator\@VItemDescriptor\@\@\@std\@\@\@std\@\@\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::vector &, char const *); + MCAPI static bool parse(class Json::Value const &, class SemVersion const &, std::vector &); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAW4ParticleType\@\@PEBD3\@Z + * @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 &, enum class ParticleType &, char const *, char const *); + 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\@\@AEAV?$vector\@W4LevelSoundEvent\@\@V?$allocator\@W4LevelSoundEvent\@\@\@std\@\@\@std\@\@PEBD3\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVBlockDescriptor\@\@\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::vector &, char const *, char const *); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, class BlockDescriptor &); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBD3\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVMobEffectInstance\@\@PEBD\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::string &, char const *, char const *); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, class MobEffectInstance &, char const *); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAW4Difficulty\@\@PEBD3\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$WeightedChoices\@VActorDefinitionTrigger\@\@\@\@PEBD\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, enum class Difficulty &, char const *, char const *); + 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\@\@AEA_NPEBD_N\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAW4ParticleType\@\@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 ParticleType &, char const *, char const *); /** - * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VActorDefinitionTrigger\@\@V?$allocator\@VActorDefinitionTrigger\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@PEBD\@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 &, std::vector &, char const *); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAUFloatRange\@\@PEBD\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAUActorDefinitionIdentifier\@\@PEBD3\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, struct FloatRange &, char const *); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, struct ActorDefinitionIdentifier &, char const *, char const *); /** - * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VItemDescriptor\@\@V?$allocator\@VItemDescriptor\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVActorDefinitionTrigger\@\@PEBD\@Z */ - MCAPI static bool parse(class Json::Value const &, class SemVersion const &, std::vector &); + MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class ActorDefinitionTrigger &, char const *); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVMobEffectInstance\@\@PEBD\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@W4LevelSoundEvent\@\@V?$allocator\@W4LevelSoundEvent\@\@\@std\@\@\@std\@\@PEBD3\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, class MobEffectInstance &, char const *); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::vector &, char const *, char const *); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$WeightedChoices\@VActorDefinitionTrigger\@\@\@\@PEBD\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAW4Difficulty\@\@PEBD3\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, class WeightedChoices &, char const *); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, enum class Difficulty &, char const *, char const *); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@PEBD\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEA_NPEBD_N\@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 &, bool &, char const *, bool); + /** + * @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\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVVec3\@\@PEBDAEBV5\@\@Z + */ + MCAPI static void parse(class Json::Value const &, class SemVersion const &, class Vec3 &, char const *, class Vec3 const &); + /** + * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VActorDefinitionTrigger\@\@V?$allocator\@VActorDefinitionTrigger\@\@\@std\@\@\@std\@\@\@Z + */ + MCAPI static bool parse(class Json::Value const &, class SemVersion const &, std::vector &); + /** + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAUFloatRange\@\@PEBD\@Z + */ + MCAPI static void parse(class Json::Value const &, class SemVersion const &, struct FloatRange &, 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\@\@SAXAEBVActorDefinitionTrigger\@\@AEAVValue\@Json\@\@PEBD\@Z */ MCAPI static void serialize(class ActorDefinitionTrigger const &, class Json::Value &, char const *); /** - * @symbol ?serialize\@Parser\@\@SAXAEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@AEAVValue\@Json\@\@PEBD\@Z + * @symbol ?serialize\@Parser\@\@SAXAEBW4ActorType\@\@AEAVValue\@Json\@\@PEBD\@Z */ - MCAPI static void serialize(std::vector const &, class Json::Value &, char const *); + MCAPI static void serialize(enum class ActorType const &, class Json::Value &, char const *); /** * @symbol ?serialize\@Parser\@\@SAXAEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@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 + * @symbol ?serialize\@Parser\@\@SAXAEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@AEAVValue\@Json\@\@PEBD\@Z */ - MCAPI static void serialize(struct FloatRange const &, class Json::Value &, char const *); + MCAPI static void serialize(std::vector const &, class Json::Value &, char const *); /** * @symbol ?serialize\@Parser\@\@SAXAEBUActorDefinitionIdentifier\@\@AEAVValue\@Json\@\@PEBD\@Z */ @@ -170,9 +174,5 @@ class Parser { * @symbol ?serialize\@Parser\@\@SAXAEBW4FilterSubject\@\@AEAVValue\@Json\@\@PEBD\@Z */ MCAPI static void serialize(enum class FilterSubject 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/PassengerJumpPacket.hpp b/LiteLoader/include/llapi/mc/PassengerJumpPacket.hpp index a6a6f70342..7f0993e9d4 100644 --- a/LiteLoader/include/llapi/mc/PassengerJumpPacket.hpp +++ b/LiteLoader/include/llapi/mc/PassengerJumpPacket.hpp @@ -51,9 +51,9 @@ class PassengerJumpPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PassengerJumpPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PassengerJumpPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0PassengerJumpPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/PathfinderNode.hpp b/LiteLoader/include/llapi/mc/PathfinderNode.hpp index b08bcce3a2..5f87bd19ba 100644 --- a/LiteLoader/include/llapi/mc/PathfinderNode.hpp +++ b/LiteLoader/include/llapi/mc/PathfinderNode.hpp @@ -28,14 +28,14 @@ class PathfinderNode { #endif public: - /** - * @symbol ??0PathfinderNode\@\@QEAA\@AEBVBlockPos\@\@W4NodeType\@\@\@Z - */ - MCAPI PathfinderNode(class BlockPos const &, enum class NodeType); /** * @symbol ??0PathfinderNode\@\@QEAA\@AEBV0\@\@Z */ MCAPI PathfinderNode(class PathfinderNode const &); + /** + * @symbol ??0PathfinderNode\@\@QEAA\@AEBVBlockPos\@\@W4NodeType\@\@\@Z + */ + MCAPI PathfinderNode(class BlockPos const &, enum class NodeType); /** * @symbol ?distanceTo\@PathfinderNode\@\@QEBAMPEAV1\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PerlinNoise.hpp b/LiteLoader/include/llapi/mc/PerlinNoise.hpp index 7b095cd71a..b006d031fc 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\@AEBV0\@\@Z - */ - MCAPI PerlinNoise(class PerlinNoise const &); /** * @symbol ??0PerlinNoise\@\@QEAA\@IHH\@Z */ MCAPI PerlinNoise(unsigned int, int, int); /** - * @symbol ??0PerlinNoise\@\@QEAA\@AEAVIRandom\@\@HH\@Z + * @symbol ??0PerlinNoise\@\@QEAA\@AEBV0\@\@Z */ - MCAPI PerlinNoise(class IRandom &, int, int); + MCAPI PerlinNoise(class PerlinNoise const &); /** * @symbol ??0PerlinNoise\@\@QEAA\@AEAVIRandom\@\@UYBlendingBugSettings\@\@HH\@Z */ MCAPI PerlinNoise(class IRandom &, struct YBlendingBugSettings, int, int); /** - * @symbol ?getRegion\@PerlinNoise\@\@QEBAXPEAMAEBVVec2\@\@HH1M\@Z + * @symbol ??0PerlinNoise\@\@QEAA\@AEAVIRandom\@\@HH\@Z */ - MCAPI void getRegion(float *, class Vec2 const &, int, int, class Vec2 const &, float) const; + MCAPI PerlinNoise(class IRandom &, int, int); /** * @symbol ?getRegion\@PerlinNoise\@\@QEBAXPEAMAEBVVec3\@\@HHH1\@Z */ MCAPI void getRegion(float *, class Vec3 const &, int, int, int, class Vec3 const &) const; + /** + * @symbol ?getRegion\@PerlinNoise\@\@QEBAXPEAMAEBVVec2\@\@HH1M\@Z + */ + MCAPI void getRegion(float *, class Vec2 const &, int, int, class Vec2 const &, float) const; /** * @symbol ?getValue\@PerlinNoise\@\@QEBAMAEBVVec3\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PerlinSimplexNoise.hpp b/LiteLoader/include/llapi/mc/PerlinSimplexNoise.hpp index 7b538010f1..2016525ce8 100644 --- a/LiteLoader/include/llapi/mc/PerlinSimplexNoise.hpp +++ b/LiteLoader/include/llapi/mc/PerlinSimplexNoise.hpp @@ -28,14 +28,14 @@ class PerlinSimplexNoise { #endif public: - /** - * @symbol ??0PerlinSimplexNoise\@\@QEAA\@AEAVIRandom\@\@H_N\@Z - */ - MCAPI PerlinSimplexNoise(class IRandom &, int, bool); /** * @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 */ @@ -44,14 +44,14 @@ class PerlinSimplexNoise { * @symbol ?getRegion\@PerlinSimplexNoise\@\@QEBAPEAMPEAMAEBVVec2\@\@HH1MM\@Z */ MCAPI float * getRegion(float *, class Vec2 const &, int, int, class Vec2 const &, float, float) const; - /** - * @symbol ?getValue\@PerlinSimplexNoise\@\@QEBAMMM\@Z - */ - MCAPI float getValue(float, float) const; /** * @symbol ?getValue\@PerlinSimplexNoise\@\@QEBAMAEBVVec3\@\@\@Z */ MCAPI float getValue(class Vec3 const &) const; + /** + * @symbol ?getValue\@PerlinSimplexNoise\@\@QEBAMMM\@Z + */ + MCAPI float getValue(float, float) const; /** * @symbol ?getValueNormalized\@PerlinSimplexNoise\@\@QEBAMMM\@Z */ diff --git a/LiteLoader/include/llapi/mc/Phantom.hpp b/LiteLoader/include/llapi/mc/Phantom.hpp index 5cf5a5a806..fb4a4d84d6 100644 --- a/LiteLoader/include/llapi/mc/Phantom.hpp +++ b/LiteLoader/include/llapi/mc/Phantom.hpp @@ -37,140 +37,135 @@ class Phantom : public Monster { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@Phantom\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 131 + * @vftbl 129 * @symbol ?shouldRender\@Phantom\@\@UEBA_NXZ */ virtual bool shouldRender() const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 + */ + virtual void __unk_vfn_176(); + /** + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_267(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 - */ - virtual void __unk_vfn_275(); - /** - * @vftbl 293 + * @vftbl 285 * @symbol ?checkSpawnRules\@Phantom\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0Phantom\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PhotoTransferPacket.hpp b/LiteLoader/include/llapi/mc/PhotoTransferPacket.hpp index de499796f9..e596c4dedf 100644 --- a/LiteLoader/include/llapi/mc/PhotoTransferPacket.hpp +++ b/LiteLoader/include/llapi/mc/PhotoTransferPacket.hpp @@ -51,9 +51,9 @@ class PhotoTransferPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PhotoTransferPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PhotoTransferPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 50f02abd63..7b9dae2859 100644 --- a/LiteLoader/include/llapi/mc/PickaxeItem.hpp +++ b/LiteLoader/include/llapi/mc/PickaxeItem.hpp @@ -37,11 +37,6 @@ class PickaxeItem : public DiggerItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -57,6 +52,11 @@ class PickaxeItem : public DiggerItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 44 * @symbol ?canDestroySpecial\@PickaxeItem\@\@UEBA_NAEBVBlock\@\@\@Z @@ -117,6 +117,16 @@ class PickaxeItem : public DiggerItem { * @symbol ?getDestroySpeed\@PickaxeItem\@\@UEBAMAEBVItemStackBase\@\@AEBVBlock\@\@\@Z */ virtual float getDestroySpeed(class ItemStackBase const &, class Block const &) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); /** * @symbol ??0PickaxeItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVTier\@Item\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/Pig.hpp b/LiteLoader/include/llapi/mc/Pig.hpp index 5c825e129b..4e60cfce46 100644 --- a/LiteLoader/include/llapi/mc/Pig.hpp +++ b/LiteLoader/include/llapi/mc/Pig.hpp @@ -37,135 +37,130 @@ class Pig : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 - */ - virtual void __unk_vfn_260(); - /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@Pig\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 266 + * @vftbl 258 * @symbol ?_playStepSound\@Pig\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0Pig\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PigZombie.hpp b/LiteLoader/include/llapi/mc/PigZombie.hpp index 92b8747ac5..4869dae642 100644 --- a/LiteLoader/include/llapi/mc/PigZombie.hpp +++ b/LiteLoader/include/llapi/mc/PigZombie.hpp @@ -37,155 +37,150 @@ class PigZombie : public Zombie { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@PigZombie\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 - */ - virtual void __unk_vfn_260(); - /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@PigZombie\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@PigZombie\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@PigZombie\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 293 + * @vftbl 285 * @symbol ?checkSpawnRules\@PigZombie\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 336 + * @vftbl 328 * @symbol ?getAttackTime\@PigZombie\@\@UEAAHXZ */ virtual int getAttackTime(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0PigZombie\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/Piglin.hpp b/LiteLoader/include/llapi/mc/Piglin.hpp index 04d2e87112..01c7e34519 100644 --- a/LiteLoader/include/llapi/mc/Piglin.hpp +++ b/LiteLoader/include/llapi/mc/Piglin.hpp @@ -37,137 +37,132 @@ class Piglin : public HumanoidMonster { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 - */ - virtual void __unk_vfn_218(); - /** - * @vftbl 230 + * @vftbl 222 * @symbol ?getInteraction\@Piglin\@\@UEAA_NAEAVPlayer\@\@AEAVActorInteraction\@\@AEBVVec3\@\@\@Z */ virtual bool getInteraction(class Player &, class ActorInteraction &, class Vec3 const &); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 258 + * @vftbl 250 * @symbol ?updateEntitySpecificMolangVariables\@Piglin\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); + /** + * @vftbl 252 + * @symbol __unk_vfn_252 + */ + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); - /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** - * @vftbl 353 + * @vftbl 345 * @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 9a988f26a1..e1b9510ad0 100644 --- a/LiteLoader/include/llapi/mc/Pillager.hpp +++ b/LiteLoader/include/llapi/mc/Pillager.hpp @@ -37,142 +37,137 @@ class Pillager : public HumanoidMonster { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 - */ - virtual void __unk_vfn_243(); - /** - * @vftbl 258 + * @vftbl 250 * @symbol ?updateEntitySpecificMolangVariables\@Pillager\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@Pillager\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 337 + * @vftbl 329 * @symbol ?_getWalkTargetValue\@Pillager\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** - * @vftbl 353 + * @vftbl 345 * @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 2ad0b10393..8763c96028 100644 --- a/LiteLoader/include/llapi/mc/PinkPetalsBlock.hpp +++ b/LiteLoader/include/llapi/mc/PinkPetalsBlock.hpp @@ -40,16 +40,21 @@ class PinkPetalsBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class PinkPetalsBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class PinkPetalsBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,152 +131,147 @@ class PinkPetalsBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@PinkPetalsBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@PinkPetalsBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 93 + * @vftbl 92 * @symbol ?mayPlaceOn\@PinkPetalsBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@PinkPetalsBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@PinkPetalsBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@PinkPetalsBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@PinkPetalsBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@PinkPetalsBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@PinkPetalsBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; @@ -280,6 +280,10 @@ class PinkPetalsBlock : public BlockLegacy { * @symbol ?canBeDestroyedByWaterSpread\@PinkPetalsBlock\@\@UEBA_NXZ */ MCVAPI bool canBeDestroyedByWaterSpread() const; + /** + * @symbol ?canBeSilkTouched\@PinkPetalsBlock\@\@UEBA_NXZ + */ + MCVAPI bool canBeSilkTouched() const; /** * @symbol ?waterSpreadCausesSpawn\@PinkPetalsBlock\@\@UEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/PistonArmBlock.hpp b/LiteLoader/include/llapi/mc/PistonArmBlock.hpp index 2509dfce65..1bca44fa5e 100644 --- a/LiteLoader/include/llapi/mc/PistonArmBlock.hpp +++ b/LiteLoader/include/llapi/mc/PistonArmBlock.hpp @@ -56,16 +56,21 @@ class PistonArmBlock : public BlockLegacy { * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -77,10 +82,10 @@ class PistonArmBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -112,10 +117,10 @@ class PistonArmBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -142,15 +147,15 @@ class PistonArmBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -158,141 +163,136 @@ class PistonArmBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@PistonArmBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 96 + * @vftbl 95 * @symbol ?breaksFallingBlocks\@PistonArmBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@PistonArmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 100 + * @vftbl 99 * @symbol ?getSecondPart\@PistonArmBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool getSecondPart(class BlockSource const &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 101 + * @vftbl 100 * @symbol ?playerWillDestroy\@PistonArmBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 102 + * @vftbl 101 * @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 103 + * @vftbl 102 * @symbol ?asItemInstance\@PistonArmBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@PistonArmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 176 + * @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 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@PistonArmBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @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 6fe1e4a349..51e69cf412 100644 --- a/LiteLoader/include/llapi/mc/PistonBlock.hpp +++ b/LiteLoader/include/llapi/mc/PistonBlock.hpp @@ -45,16 +45,21 @@ class PistonBlock : public ActorBlock { * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class PistonBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class PistonBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,20 +136,20 @@ class PistonBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** * @vftbl 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 55 * @symbol ?isValidAuxValue\@PistonBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; + /** + * @vftbl 59 + * @symbol __unk_vfn_59 + */ + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -152,156 +157,151 @@ class PistonBlock : public ActorBlock { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@PistonBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 64 + * @vftbl 63 * @symbol ?shouldConnectToRedstone\@PistonBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 73 + * @vftbl 72 * @symbol ?onRedstoneUpdate\@PistonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@PistonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 96 + * @vftbl 95 * @symbol ?breaksFallingBlocks\@PistonBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@PistonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 100 + * @vftbl 99 * @symbol ?getSecondPart\@PistonBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool getSecondPart(class BlockSource const &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@PistonBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?getMappedFace\@PistonBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@PistonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@PistonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@PistonBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @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 56db8c2dce..a14f87369c 100644 --- a/LiteLoader/include/llapi/mc/PistonBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/PistonBlockActor.hpp @@ -96,17 +96,17 @@ class PistonBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); /** - * @vftbl 37 + * @vftbl 39 * @symbol ?_getUpdatePacket\@PistonBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 38 + * @vftbl 40 * @symbol ?_onUpdatePacket\@PistonBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/PitcherCropBlock.hpp b/LiteLoader/include/llapi/mc/PitcherCropBlock.hpp new file mode 100644 index 0000000000..a56fc6eee8 --- /dev/null +++ b/LiteLoader/include/llapi/mc/PitcherCropBlock.hpp @@ -0,0 +1,327 @@ +/** + * @file PitcherCropBlock.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "BushBlock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class PitcherCropBlock : public BushBlock { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PITCHERCROPBLOCK +public: + class PitcherCropBlock& operator=(class PitcherCropBlock const &) = delete; + PitcherCropBlock(class PitcherCropBlock const &) = delete; + PitcherCropBlock() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 10 + * @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 + */ + 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(); + /** + * @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 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 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 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @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 ?canContainLiquid\@PitcherCropBlock\@\@UEBA_NXZ + */ + virtual bool canContainLiquid() const; + /** + * @vftbl 68 + * @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 + */ + virtual void __unk_vfn_74(); + /** + * @vftbl 81 + * @symbol __unk_vfn_81 + */ + virtual void __unk_vfn_81(); + /** + * @vftbl 85 + * @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 + * @symbol ?canBeFertilized\@PitcherCropBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + */ + virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; + /** + * @vftbl 90 + * @symbol ?mayPlace\@PitcherCropBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + */ + virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; + /** + * @vftbl 91 + * @symbol ?mayPlace\@PitcherCropBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; + /** + * @vftbl 92 + * @symbol ?mayPlaceOn\@PitcherCropBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; + /** + * @vftbl 98 + * @symbol ?neighborChanged\@PitcherCropBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + */ + virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; + /** + * @vftbl 99 + * @symbol ?getSecondPart\@PitcherCropBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z + */ + virtual bool getSecondPart(class BlockSource const &, class BlockPos const &, class BlockPos &) const; + /** + * @vftbl 101 + * @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 + * @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 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); + /** + * @vftbl 123 + * @symbol __unk_vfn_123 + */ + virtual void __unk_vfn_123(); + /** + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 + */ + virtual void __unk_vfn_127(); + /** + * @vftbl 130 + * @symbol __unk_vfn_130 + */ + virtual void __unk_vfn_130(); + /** + * @vftbl 142 + * @symbol ?getVisualShape\@PitcherCropBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + */ + virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + /** + * @vftbl 155 + * @symbol __unk_vfn_155 + */ + virtual void __unk_vfn_155(); + /** + * @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 170 + * @symbol ?tick\@PitcherCropBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + */ + virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; + /** + * @vftbl 171 + * @symbol ?randomTick\@PitcherCropBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + */ + virtual void randomTick(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 178 + * @symbol ?canSurvive\@PitcherCropBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; + /** + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@PitcherCropBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + */ + virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PITCHERCROPBLOCK + /** + * @symbol ?canBeSilkTouched\@PitcherCropBlock\@\@MEBA_NXZ + */ + MCVAPI bool canBeSilkTouched() const; +#endif + /** + * @symbol ??0PitcherCropBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + */ + MCAPI PitcherCropBlock(std::string const &, int); + +//private: + /** + * @symbol ?_grow\@PitcherCropBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z + */ + MCAPI bool _grow(class BlockSource &, class BlockPos const &, bool) const; + +private: + +}; diff --git a/LiteLoader/include/llapi/mc/MangroveLeafBlock.hpp b/LiteLoader/include/llapi/mc/PitcherPlantBlock.hpp similarity index 52% rename from LiteLoader/include/llapi/mc/MangroveLeafBlock.hpp rename to LiteLoader/include/llapi/mc/PitcherPlantBlock.hpp index cda33623d0..23b1da9bf6 100644 --- a/LiteLoader/include/llapi/mc/MangroveLeafBlock.hpp +++ b/LiteLoader/include/llapi/mc/PitcherPlantBlock.hpp @@ -1,30 +1,27 @@ /** - * @file MangroveLeafBlock.hpp + * @file PitcherPlantBlock.hpp * */ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "LeafBlock.hpp" +#include "DoublePlantBaseBlock.hpp" #define BEFORE_EXTRA #undef BEFORE_EXTRA -/** - * @brief MC class MangroveLeafBlock. - * - */ -class MangroveLeafBlock : public LeafBlock { + +class PitcherPlantBlock : public DoublePlantBaseBlock { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_MANGROVELEAFBLOCK +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PITCHERPLANTBLOCK public: - class MangroveLeafBlock& operator=(class MangroveLeafBlock const &) = delete; - MangroveLeafBlock(class MangroveLeafBlock const &) = delete; - MangroveLeafBlock() = delete; + class PitcherPlantBlock& operator=(class PitcherPlantBlock const &) = delete; + PitcherPlantBlock(class PitcherPlantBlock const &) = delete; + PitcherPlantBlock() = delete; #endif public: @@ -38,16 +35,21 @@ class MangroveLeafBlock : public LeafBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -59,10 +61,10 @@ class MangroveLeafBlock : public LeafBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -94,10 +96,10 @@ class MangroveLeafBlock : public LeafBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -124,128 +126,123 @@ class MangroveLeafBlock : public LeafBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 - * @symbol ?onFertilized\@MangroveLeafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 85 + * @symbol ?onFertilized\@PitcherPlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 - * @symbol ?canBeFertilized\@MangroveLeafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 87 + * @symbol ?canBeFertilized\@PitcherPlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_169(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_173(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_177(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 - */ - virtual void __unk_vfn_187(); - /** - * @vftbl 189 - * @symbol ?getResourceItem\@MangroveLeafBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@PitcherPlantBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 - * @symbol ?getSilkTouchItemInstance\@MangroveLeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@PitcherPlantBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ - virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; + virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @symbol ??0MangroveLeafBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HV?$WeakPtr\@VBlockLegacy\@\@\@\@\@Z + * @symbol ??0PitcherPlantBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ - MCAPI MangroveLeafBlock(std::string const &, int, class WeakPtr); + MCAPI PitcherPlantBlock(std::string const &, int); }; diff --git a/LiteLoader/include/llapi/mc/PlanksBlock.hpp b/LiteLoader/include/llapi/mc/PlanksBlock.hpp index 1c49a959d1..cf72fcdf09 100644 --- a/LiteLoader/include/llapi/mc/PlanksBlock.hpp +++ b/LiteLoader/include/llapi/mc/PlanksBlock.hpp @@ -40,16 +40,21 @@ class PlanksBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class PlanksBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class PlanksBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,137 +131,132 @@ class PlanksBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@PlanksBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@PlanksBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 162 + * @vftbl 160 * @symbol ?_addHardCodedBlockComponents\@PlanksBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 186 + * @vftbl 185 * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@PlanksBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @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 13d8c2dea3..6024a9276b 100644 --- a/LiteLoader/include/llapi/mc/PlanterItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/PlanterItemComponent.hpp @@ -46,24 +46,38 @@ class PlanterItemComponent { virtual void __unk_vfn_2(); /** * @vftbl 3 - * @symbol ?useOn\@PlanterItemComponent\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol __unk_vfn_3 */ - virtual bool useOn(class ItemStack &, class Actor &, class BlockPos const &, unsigned char, class Vec3 const &) const; + virtual void __unk_vfn_3(); /** * @vftbl 4 - * @symbol __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 * @symbol ?buildNetworkTag\@?$NetworkedItemComponent\@VPlanterItemComponent\@\@\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 5 * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VPlanterItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); + /** + * @vftbl 6 + * @symbol __unk_vfn_6 + */ + virtual void __unk_vfn_6(); + /** + * @vftbl 7 + * @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 + * @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; + /** + * @symbol ??0PlanterItemComponent\@\@QEAA\@PEAVComponentItem\@\@AEBVBlock\@\@\@Z + */ + MCAPI PlanterItemComponent(class ComponentItem *, class Block const &); /** * @symbol ?calculatePlacePos\@PlanterItemComponent\@\@QEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ @@ -77,4 +91,12 @@ class PlanterItemComponent { */ MCAPI static class HashedString const & getIdentifier(); +//private: + /** + * @symbol ?_placeBlock\@PlanterItemComponent\@\@AEBA_NAEAVItemStack\@\@AEAVActor\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI bool _placeBlock(class ItemStack &, class Actor &, class Block const &, class BlockPos const &) const; + +private: + }; diff --git a/LiteLoader/include/llapi/mc/PlayJumpSoundSystem.hpp b/LiteLoader/include/llapi/mc/PlayJumpSoundSystem.hpp index 20139f1684..9711b01a87 100644 --- a/LiteLoader/include/llapi/mc/PlayJumpSoundSystem.hpp +++ b/LiteLoader/include/llapi/mc/PlayJumpSoundSystem.hpp @@ -17,12 +17,16 @@ namespace PlayJumpSoundSystem { #undef AFTER_EXTRA /** - * @symbol ?createSideBySideSystem\@PlayJumpSoundSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createPlayJumpSoundSystem\@PlayJumpSoundSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI struct TickingSystemWithInfo createSideBySideSystem(); + MCAPI struct TickingSystemWithInfo createPlayJumpSoundSystem(); /** - * @symbol ?createSystem\@PlayJumpSoundSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createPlayPowerJumpSoundSideBySideSystem\@PlayJumpSoundSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI struct TickingSystemWithInfo createSystem(); + MCAPI struct TickingSystemWithInfo createPlayPowerJumpSoundSideBySideSystem(); + /** + * @symbol ?createPlayPowerJumpSoundSystem\@PlayJumpSoundSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI struct TickingSystemWithInfo createPlayPowerJumpSoundSystem(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PlayJumpSoundSystemImpl.hpp b/LiteLoader/include/llapi/mc/PlayJumpSoundSystemImpl.hpp new file mode 100644 index 0000000000..20017f2209 --- /dev/null +++ b/LiteLoader/include/llapi/mc/PlayJumpSoundSystemImpl.hpp @@ -0,0 +1,32 @@ +/** + * @file PlayJumpSoundSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace PlayJumpSoundSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?doPlayJumpSoundSystem\@PlayJumpSoundSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEBUActorDefinitionIdentifierComponent\@\@AEBUGetAttachPosRequestComponent\@\@AEBUSoundEventPlayerComponent\@\@AEBUSynchedActorDataComponent\@\@AEBUStateVectorComponent\@\@AEBUAABBShapeComponent\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@USoundEventRequestQueueComponent\@\@\@\@AEBVIConstBlockSource\@\@\@Z + */ + MCAPI void doPlayJumpSoundSystem(class StrictEntityContext const &, struct ActorDefinitionIdentifierComponent const &, struct GetAttachPosRequestComponent const &, struct SoundEventPlayerComponent const &, struct SynchedActorDataComponent const &, struct StateVectorComponent const &, struct AABBShapeComponent const &, class ViewT const &, class IConstBlockSource const &); + /** + * @symbol ?doPlayPowerJumpSoundSystem\@PlayJumpSoundSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEBUActorDefinitionIdentifierComponent\@\@AEBUGetAttachPosRequestComponent\@\@AEBUSoundEventPlayerComponent\@\@AEBUSynchedActorDataComponent\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@USoundEventRequestQueueComponent\@\@\@\@AEBVIConstBlockSource\@\@\@Z + */ + MCAPI void doPlayPowerJumpSoundSystem(class StrictEntityContext const &, struct ActorDefinitionIdentifierComponent const &, struct GetAttachPosRequestComponent const &, struct SoundEventPlayerComponent const &, struct SynchedActorDataComponent const &, class ViewT const &, class IConstBlockSource const &); + /** + * @symbol ?sendSoundRequest\@PlayJumpSoundSystemImpl\@\@YAXAEBVIConstBlockSource\@\@AEBUSynchedActorDataComponent\@\@AEBUActorDefinitionIdentifierComponent\@\@V?$optional\@VVec3\@\@\@std\@\@V?$OptionalComponentWrapper\@VStrictEntityContext\@\@USoundEventRequestQueueComponent\@\@\@\@H\@Z + */ + MCAPI void sendSoundRequest(class IConstBlockSource const &, struct SynchedActorDataComponent const &, struct ActorDefinitionIdentifierComponent const &, class std::optional, class OptionalComponentWrapper, int); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PlaySoundPacket.hpp b/LiteLoader/include/llapi/mc/PlaySoundPacket.hpp index 62be263f7a..5f4521840b 100644 --- a/LiteLoader/include/llapi/mc/PlaySoundPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlaySoundPacket.hpp @@ -51,9 +51,9 @@ class PlaySoundPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PlaySoundPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PlaySoundPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYSOUNDPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/PlayStatusPacket.hpp b/LiteLoader/include/llapi/mc/PlayStatusPacket.hpp index 0fdf91df31..c96f1f7b3d 100644 --- a/LiteLoader/include/llapi/mc/PlayStatusPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayStatusPacket.hpp @@ -68,9 +68,9 @@ class PlayStatusPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PlayStatusPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PlayStatusPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 8e73c2de75..a9487ef5ce 100644 --- a/LiteLoader/include/llapi/mc/Player.hpp +++ b/LiteLoader/include/llapi/mc/Player.hpp @@ -250,1007 +250,967 @@ class Player : public Mob { */ virtual void remove(); /** - * @vftbl 26 + * @vftbl 25 * @symbol ?getAttachPos\@Player\@\@UEBA?AVVec3\@\@W4ActorLocation\@\@M\@Z */ virtual class Vec3 getAttachPos(enum class ActorLocation, float) const; /** - * @vftbl 28 + * @vftbl 27 * @symbol ?move\@Player\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void move(class Vec3 const &); /** - * @vftbl 29 + * @vftbl 28 * @symbol ?move\@Player\@\@UEBAXAEAUIActorMovementProxy\@\@AEBVVec3\@\@\@Z */ virtual void move(struct IActorMovementProxy &, class Vec3 const &) const; /** - * @vftbl 36 + * @vftbl 35 * @symbol ?getInterpolatedRidingOffset\@Player\@\@UEBA?AVVec3\@\@MH\@Z */ virtual class Vec3 getInterpolatedRidingOffset(float, int) const; /** - * @vftbl 40 + * @vftbl 39 * @symbol ?isFireImmune\@Player\@\@UEBA_NXZ */ virtual bool isFireImmune() const; /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 44 + * @vftbl 43 * @symbol ?teleportTo\@Player\@\@UEAAXAEBVVec3\@\@_NHH1\@Z */ virtual void teleportTo(class Vec3 const &, bool, int, int, bool); /** - * @vftbl 48 + * @vftbl 47 * @symbol ?tryCreateAddActorPacket\@Player\@\@UEAA?AV?$unique_ptr\@VAddActorBasePacket\@\@U?$default_delete\@VAddActorBasePacket\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr tryCreateAddActorPacket(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@Player\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 51 + * @vftbl 50 * @symbol ?passengerTick\@Player\@\@UEAAXXZ */ virtual void passengerTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 66 + * @vftbl 65 * @symbol ?getFormattedNameTag\@Player\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getFormattedNameTag() const; /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 76 + * @vftbl 74 * @symbol ?setBlockMovementSlowdownMultiplier\@Player\@\@UEAAXAEBVBlockLegacy\@\@AEBVVec3\@\@\@Z */ virtual void setBlockMovementSlowdownMultiplier(class BlockLegacy const &, class Vec3 const &); /** - * @vftbl 78 + * @vftbl 76 * @symbol ?getCameraOffset\@Player\@\@UEBAMXZ */ virtual float getCameraOffset() const; /** - * @vftbl 80 + * @vftbl 78 * @symbol ?getShadowRadius\@Player\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 83 + * @symbol ?canInteractWithOtherEntitiesInGame\@Player\@\@UEBA_NXZ */ - virtual void __unk_vfn_85(); + virtual bool canInteractWithOtherEntitiesInGame() const; /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_86(); /** - * @vftbl 92 + * @vftbl 90 * @symbol ?isImmobile\@Player\@\@UEBA_NXZ */ virtual bool isImmobile() const; /** - * @vftbl 94 + * @vftbl 92 * @symbol ?isSilentObserver\@Player\@\@UEBA_NXZ */ virtual bool isSilentObserver() const; /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_94(); /** - * @vftbl 97 + * @vftbl 95 * @symbol ?isSleeping\@Player\@\@UEBA_NXZ */ virtual bool isSleeping() const; /** - * @vftbl 98 + * @vftbl 96 * @symbol ?setSleeping\@Player\@\@UEAAX_N\@Z */ virtual void setSleeping(bool); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_97(); /** - * @vftbl 101 + * @vftbl 99 * @symbol ?isBlocking\@Player\@\@UEBA_NXZ */ virtual bool isBlocking() const; /** - * @vftbl 102 + * @vftbl 100 * @symbol ?isDamageBlocked\@Player\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isDamageBlocked(class ActorDamageSource const &) const; + /** + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 116 + * @vftbl 114 * @symbol ?attack\@Player\@\@UEAA_NAEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z */ virtual bool attack(class Actor &, enum class ActorDamageCause const &); /** - * @vftbl 134 + * @vftbl 132 * @symbol ?isInvulnerableTo\@Player\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 139 + * @vftbl 137 * @symbol ?onBounceStarted\@Player\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void onBounceStarted(class BlockPos const &, class Block const &); /** - * @vftbl 140 + * @vftbl 138 * @symbol ?feed\@Player\@\@UEAAXH\@Z */ virtual void feed(int); /** - * @vftbl 141 + * @vftbl 139 * @symbol ?handleEntityEvent\@Player\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 143 + * @vftbl 141 * @symbol ?getActorRendererId\@Player\@\@UEBAAEBVHashedString\@\@XZ */ virtual class HashedString const & getActorRendererId() const; /** - * @vftbl 149 + * @vftbl 147 * @symbol ?awardKillScore\@Player\@\@UEAAXAEAVActor\@\@H\@Z */ virtual void awardKillScore(class Actor &, int); /** - * @vftbl 150 + * @vftbl 148 * @symbol ?setArmor\@Player\@\@UEAAXW4ArmorSlot\@\@AEBVItemStack\@\@\@Z */ virtual void setArmor(enum class ArmorSlot, class ItemStack const &); /** - * @vftbl 158 + * @vftbl 156 * @symbol ?setCarriedItem\@Player\@\@UEAAXAEBVItemStack\@\@\@Z */ virtual void setCarriedItem(class ItemStack const &); /** - * @vftbl 159 + * @vftbl 157 * @symbol ?getCarriedItem\@Player\@\@UEBAAEBVItemStack\@\@XZ */ virtual class ItemStack const & getCarriedItem() const; /** - * @vftbl 160 + * @vftbl 158 * @symbol ?setOffhandSlot\@Player\@\@UEAAXAEBVItemStack\@\@\@Z */ virtual void setOffhandSlot(class ItemStack const &); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?getEquippedTotem\@Player\@\@UEBAAEBVItemStack\@\@XZ */ virtual class ItemStack const & getEquippedTotem() const; /** - * @vftbl 162 + * @vftbl 160 * @symbol ?consumeTotem\@Player\@\@UEAA_NXZ */ virtual bool consumeTotem(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?getEntityTypeId\@Player\@\@UEBA?AW4ActorType\@\@XZ */ virtual enum class ActorType getEntityTypeId() const; /** - * @vftbl 171 + * @vftbl 169 * @symbol ?canFreeze\@Player\@\@UEBA_NXZ */ virtual bool canFreeze() const; /** - * @vftbl 175 + * @vftbl 173 * @symbol ?getPortalCooldown\@Player\@\@UEBAHXZ */ virtual int getPortalCooldown() const; /** - * @vftbl 176 + * @vftbl 174 * @symbol ?getPortalWaitTime\@Player\@\@UEBAHXZ */ virtual int getPortalWaitTime() const; /** - * @vftbl 177 + * @vftbl 175 * @symbol ?canChangeDimensionsUsingPortal\@Player\@\@UEBA_NXZ */ virtual bool canChangeDimensionsUsingPortal() const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 187 + * @vftbl 185 * @symbol ?onSynchedDataUpdate\@Player\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 188 + * @vftbl 186 * @symbol ?canAddPassenger\@Player\@\@UEBA_NAEAVActor\@\@\@Z */ virtual bool canAddPassenger(class Actor &) const; /** - * @vftbl 190 + * @vftbl 188 * @symbol ?canBePulledIntoVehicle\@Player\@\@UEBA_NXZ */ virtual bool canBePulledIntoVehicle() const; /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 194 + * @vftbl 192 * @symbol ?sendMotionPacketIfNeeded\@Player\@\@UEAAXXZ */ virtual void sendMotionPacketIfNeeded(); /** - * @vftbl 197 + * @vftbl 195 * @symbol ?startSwimming\@Player\@\@UEAAXXZ */ virtual void startSwimming(); /** - * @vftbl 198 + * @vftbl 196 * @symbol ?stopSwimming\@Player\@\@UEAAXXZ */ virtual void stopSwimming(); /** - * @vftbl 200 + * @vftbl 198 * @symbol ?getCommandPermissionLevel\@Player\@\@UEBA?AW4CommandPermissionLevel\@\@XZ */ virtual enum class CommandPermissionLevel getCommandPermissionLevel() const; /** - * @vftbl 212 + * @vftbl 210 * @symbol ?canObstructSpawningAndBlockPlacement\@Player\@\@UEBA_NXZ */ virtual bool canObstructSpawningAndBlockPlacement() const; /** - * @vftbl 213 + * @vftbl 211 * @symbol ?getAnimationComponent\@Player\@\@UEAAAEAVAnimationComponent\@\@XZ */ virtual class AnimationComponent & getAnimationComponent(); /** - * @vftbl 216 + * @vftbl 214 * @symbol ?useItem\@Player\@\@UEAAXAEAVItemStackBase\@\@W4ItemUseMethod\@\@_N\@Z */ virtual void useItem(class ItemStackBase &, enum class ItemUseMethod, bool); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 220 + * @vftbl 218 * @symbol ?getMapDecorationRotation\@Player\@\@UEBAMXZ */ virtual float getMapDecorationRotation() const; /** - * @vftbl 222 - * @symbol ?isWorldBuilder\@Player\@\@UEBA_NXZ - */ - virtual bool isWorldBuilder() const; - /** - * @vftbl 223 - * @symbol ?isCreative\@Player\@\@UEBA_NXZ - */ - virtual bool isCreative() const; - /** - * @vftbl 224 - * @symbol ?isAdventure\@Player\@\@UEBA_NXZ - */ - virtual bool isAdventure() const; - /** - * @vftbl 225 - * @symbol ?isSurvival\@Player\@\@UEBA_NXZ - */ - virtual bool isSurvival() const; - /** - * @vftbl 226 - * @symbol ?isSpectator\@Player\@\@UEBA_NXZ - */ - virtual bool isSpectator() const; - /** - * @vftbl 228 + * @vftbl 220 * @symbol ?add\@Player\@\@UEAA_NAEAVItemStack\@\@\@Z */ virtual bool add(class ItemStack &); /** - * @vftbl 229 + * @vftbl 221 * @symbol ?drop\@Player\@\@UEAA_NAEBVItemStack\@\@_N\@Z */ virtual bool drop(class ItemStack const &, bool); /** - * @vftbl 237 + * @vftbl 229 * @symbol ?startSpinAttack\@Player\@\@UEAAXXZ */ virtual void startSpinAttack(); /** - * @vftbl 238 + * @vftbl 230 * @symbol ?stopSpinAttack\@Player\@\@UEAAXXZ */ virtual void stopSpinAttack(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 245 + * @vftbl 237 * @symbol ?die\@Player\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 246 + * @vftbl 238 * @symbol ?shouldDropDeathLoot\@Player\@\@UEBA_NXZ */ virtual bool shouldDropDeathLoot() const; /** - * @vftbl 252 + * @vftbl 244 * @symbol ?getLastDeathPos\@Player\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@XZ */ virtual class std::optional getLastDeathPos() const; /** - * @vftbl 253 + * @vftbl 245 * @symbol ?getLastDeathDimension\@Player\@\@UEBA?AV?$optional\@V?$AutomaticID\@VDimension\@\@H\@\@\@std\@\@XZ */ virtual class std::optional> getLastDeathDimension() const; /** - * @vftbl 254 + * @vftbl 246 * @symbol ?hasDiedBefore\@Player\@\@UEBA_NXZ */ virtual bool hasDiedBefore() const; /** - * @vftbl 256 + * @vftbl 248 * @symbol ?_shouldProvideFeedbackOnHandContainerItemSet\@Player\@\@MEBA_NW4HandSlot\@\@AEBVItemStack\@\@\@Z */ virtual bool _shouldProvideFeedbackOnHandContainerItemSet(enum class HandSlot, class ItemStack const &) const; /** - * @vftbl 257 + * @vftbl 249 * @symbol ?_shouldProvideFeedbackOnArmorSet\@Player\@\@MEBA_NW4ArmorSlot\@\@AEBVItemStack\@\@\@Z */ virtual bool _shouldProvideFeedbackOnArmorSet(enum class ArmorSlot, class ItemStack const &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@Player\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@Player\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@Player\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 274 + * @vftbl 266 * @symbol ?_onSizeUpdated\@Player\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 281 + * @vftbl 273 * @symbol ?getSpeed\@Player\@\@UEBAMXZ */ virtual float getSpeed() const; /** - * @vftbl 282 + * @vftbl 274 * @symbol ?setSpeed\@Player\@\@UEAAXM\@Z */ virtual void setSpeed(float); /** - * @vftbl 286 + * @vftbl 278 * @symbol ?travel\@Player\@\@UEAAXMMM_N\@Z */ virtual void travel(float, float, float, bool); /** - * @vftbl 288 + * @vftbl 280 * @symbol ?aiStep\@Player\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 289 + * @vftbl 281 * @symbol ?aiStep\@Player\@\@UEBAXAEAUIMobMovementProxy\@\@\@Z */ virtual void aiStep(struct IMobMovementProxy &) const; /** - * @vftbl 296 + * @vftbl 288 * @symbol ?getItemUseDuration\@Player\@\@UEBAHXZ */ virtual int getItemUseDuration() const; /** - * @vftbl 297 + * @vftbl 289 * @symbol ?getItemUseStartupProgress\@Player\@\@UEBAMXZ */ virtual float getItemUseStartupProgress() const; /** - * @vftbl 298 + * @vftbl 290 * @symbol ?getItemUseIntervalProgress\@Player\@\@UEBAMXZ */ virtual float getItemUseIntervalProgress() const; /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 321 + * @vftbl 313 * @symbol ?getAllHand\@Player\@\@UEBA?AV?$vector\@PEBVItemStack\@\@V?$allocator\@PEBVItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getAllHand() const; /** - * @vftbl 322 + * @vftbl 314 * @symbol ?getAllEquipment\@Player\@\@UEBA?AV?$vector\@PEBVItemStack\@\@V?$allocator\@PEBVItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getAllEquipment() const; /** - * @vftbl 324 + * @vftbl 316 * @symbol ?dropEquipmentOnDeath\@Player\@\@UEAAXAEBVActorDamageSource\@\@H\@Z */ virtual void dropEquipmentOnDeath(class ActorDamageSource const &, int); /** - * @vftbl 325 + * @vftbl 317 * @symbol ?dropEquipmentOnDeath\@Player\@\@UEAAXXZ */ virtual void dropEquipmentOnDeath(); /** - * @vftbl 326 + * @vftbl 318 * @symbol ?clearVanishEnchantedItemsOnDeath\@Player\@\@UEAAXXZ */ virtual void clearVanishEnchantedItemsOnDeath(); /** - * @vftbl 327 + * @vftbl 319 * @symbol ?sendInventory\@Player\@\@UEAAX_N\@Z */ virtual void sendInventory(bool); /** - * @vftbl 338 + * @vftbl 330 * @symbol ?canExistWhenDisallowMob\@Player\@\@UEBA_NXZ */ virtual bool canExistWhenDisallowMob() const; /** - * @vftbl 343 + * @vftbl 335 * @symbol ?initBodyControl\@Player\@\@EEAA?AV?$unique_ptr\@VBodyControl\@\@U?$default_delete\@VBodyControl\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr initBodyControl(); /** - * @vftbl 344 + * @vftbl 336 * @symbol ?jumpFromGround\@Player\@\@UEAAXAEBVIConstBlockSource\@\@\@Z */ virtual void jumpFromGround(class IConstBlockSource const &); /** - * @vftbl 345 + * @vftbl 337 * @symbol ?jumpFromGround\@Player\@\@UEBAXAEAUIMobMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z */ virtual void jumpFromGround(struct IMobMovementProxy &, class IConstBlockSource const &) const; /** - * @vftbl 350 + * @vftbl 342 * @symbol ?updateGliding\@Player\@\@MEAAXXZ */ virtual void updateGliding(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** - * @vftbl 353 + * @vftbl 345 * @symbol ?prepareRegion\@Player\@\@UEAAXAEAVChunkSource\@\@\@Z */ virtual void prepareRegion(class ChunkSource &); /** - * @vftbl 354 + * @vftbl 346 * @symbol ?destroyRegion\@Player\@\@UEAAXXZ */ virtual void destroyRegion(); /** - * @vftbl 355 + * @vftbl 347 * @symbol ?suspendRegion\@Player\@\@UEAAXXZ */ virtual void suspendRegion(); /** - * @vftbl 356 + * @vftbl 348 * @symbol ?resendAllChunks\@Player\@\@UEAAXXZ */ virtual void resendAllChunks(); /** - * @vftbl 357 + * @vftbl 349 * @symbol ?_fireWillChangeDimension\@Player\@\@UEAAXXZ */ virtual void _fireWillChangeDimension(); /** - * @vftbl 358 + * @vftbl 350 * @symbol ?_fireDimensionChanged\@Player\@\@UEAAXXZ */ virtual void _fireDimensionChanged(); /** - * @vftbl 359 + * @vftbl 351 * @symbol ?changeDimensionWithCredits\@Player\@\@UEAAXV?$AutomaticID\@VDimension\@\@H\@\@\@Z */ virtual void changeDimensionWithCredits(class AutomaticID); /** - * @vftbl 360 + * @vftbl 352 * @symbol ?tickWorld\@Player\@\@UEAAXAEBUTick\@\@\@Z */ virtual void tickWorld(struct Tick const &); /** - * @vftbl 361 - * @symbol __unk_vfn_361 + * @vftbl 353 + * @symbol __unk_vfn_353 */ - virtual void __unk_vfn_361() = 0; + virtual void __unk_vfn_353() = 0; /** - * @vftbl 362 + * @vftbl 354 * @symbol ?getTickingOffsets\@Player\@\@UEBAAEBV?$vector\@VChunkPos\@\@V?$allocator\@VChunkPos\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const & getTickingOffsets() const; /** - * @vftbl 363 + * @vftbl 355 * @symbol ?moveView\@Player\@\@UEAAXXZ */ virtual void moveView(); /** - * @vftbl 364 + * @vftbl 356 * @symbol ?moveSpawnView\@Player\@\@UEAAXAEBVVec3\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ virtual void moveSpawnView(class Vec3 const &, class AutomaticID); /** - * @vftbl 365 + * @vftbl 357 * @symbol ?setName\@Player\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void setName(std::string const &); /** - * @vftbl 366 + * @vftbl 358 * @symbol ?getTravelledMethod\@Player\@\@UEBA?AW4TravelMethod\@\@XZ */ virtual enum class TravelMethod getTravelledMethod() const; /** - * @vftbl 367 + * @vftbl 359 * @symbol ?checkMovementStats\@Player\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void checkMovementStats(class Vec3 const &); /** - * @vftbl 368 - * @symbol __unk_vfn_368 + * @vftbl 360 + * @symbol __unk_vfn_360 */ - virtual void __unk_vfn_368(); + virtual void __unk_vfn_360(); /** - * @vftbl 369 - * @symbol __unk_vfn_369 + * @vftbl 361 + * @symbol __unk_vfn_361 */ - virtual void __unk_vfn_369(); + virtual void __unk_vfn_361(); /** - * @vftbl 370 + * @vftbl 362 * @symbol ?respawn\@Player\@\@UEAAXXZ */ virtual void respawn(); /** - * @vftbl 371 - * @symbol __unk_vfn_371 + * @vftbl 363 + * @symbol __unk_vfn_363 */ - virtual void __unk_vfn_371(); + virtual void __unk_vfn_363(); /** - * @vftbl 372 - * @symbol __unk_vfn_372 + * @vftbl 364 + * @symbol __unk_vfn_364 */ - virtual void __unk_vfn_372(); + virtual void __unk_vfn_364(); /** - * @vftbl 373 + * @vftbl 365 * @symbol ?hasResource\@Player\@\@UEAA_NH\@Z */ virtual bool hasResource(int); /** - * @vftbl 374 + * @vftbl 366 * @symbol ?completeUsingItem\@Player\@\@UEAAXXZ */ virtual void completeUsingItem(); /** - * @vftbl 375 + * @vftbl 367 * @symbol ?startDestroying\@Player\@\@UEAAXXZ */ virtual void startDestroying(); /** - * @vftbl 376 + * @vftbl 368 * @symbol ?stopDestroying\@Player\@\@UEAAXXZ */ virtual void stopDestroying(); /** - * @vftbl 377 - * @symbol __unk_vfn_377 + * @vftbl 369 + * @symbol __unk_vfn_369 */ - virtual void __unk_vfn_377(); + virtual void __unk_vfn_369(); /** - * @vftbl 378 - * @symbol __unk_vfn_378 + * @vftbl 370 + * @symbol __unk_vfn_370 */ - virtual void __unk_vfn_378(); + virtual void __unk_vfn_370(); /** - * @vftbl 379 + * @vftbl 371 * @symbol ?openTrading\@Player\@\@UEAAXAEBUActorUniqueID\@\@_N\@Z */ virtual void openTrading(struct ActorUniqueID const &, bool); /** - * @vftbl 380 + * @vftbl 372 * @symbol ?canOpenContainerScreen\@Player\@\@UEAA_NXZ */ virtual bool canOpenContainerScreen(); /** - * @vftbl 381 - * @symbol __unk_vfn_381 + * @vftbl 373 + * @symbol __unk_vfn_373 */ - virtual void __unk_vfn_381(); + virtual void __unk_vfn_373(); /** - * @vftbl 382 + * @vftbl 374 * @symbol ?openNpcInteractScreen\@Player\@\@UEAAXV?$shared_ptr\@UINpcDialogueData\@\@\@std\@\@\@Z */ virtual void openNpcInteractScreen(class std::shared_ptr); /** - * @vftbl 383 + * @vftbl 375 * @symbol ?openInventory\@Player\@\@UEAAXXZ */ virtual void openInventory(); /** - * @vftbl 384 - * @symbol __unk_vfn_384 + * @vftbl 376 + * @symbol __unk_vfn_376 */ - virtual void __unk_vfn_384(); + virtual void __unk_vfn_376(); /** - * @vftbl 385 - * @symbol __unk_vfn_385 + * @vftbl 377 + * @symbol __unk_vfn_377 */ - virtual void __unk_vfn_385(); + virtual void __unk_vfn_377(); /** - * @vftbl 386 + * @vftbl 378 * @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 387 + * @vftbl 379 * @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 388 + * @vftbl 380 * @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 389 + * @vftbl 381 * @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 390 + * @vftbl 382 * @symbol ?startSleepInBed\@Player\@\@UEAA?AW4BedSleepingResult\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BedSleepingResult startSleepInBed(class BlockPos const &); /** - * @vftbl 391 + * @vftbl 383 * @symbol ?stopSleepInBed\@Player\@\@UEAAX_N0\@Z */ virtual void stopSleepInBed(bool, bool); /** - * @vftbl 392 + * @vftbl 384 * @symbol ?canStartSleepInBed\@Player\@\@UEAA_NXZ */ virtual bool canStartSleepInBed(); /** - * @vftbl 393 + * @vftbl 385 * @symbol ?getSleepTimer\@Player\@\@UEBAHXZ */ virtual int getSleepTimer() const; /** - * @vftbl 394 + * @vftbl 386 * @symbol ?getPreviousTickSleepTimer\@Player\@\@UEBAHXZ */ virtual int getPreviousTickSleepTimer() const; /** - * @vftbl 395 + * @vftbl 387 * @symbol ?openSign\@Player\@\@UEAAXAEBVBlockPos\@\@_N\@Z */ virtual void openSign(class BlockPos const &, bool); /** - * @vftbl 396 - * @symbol __unk_vfn_396 + * @vftbl 388 + * @symbol __unk_vfn_388 */ - virtual void __unk_vfn_396(); + virtual void __unk_vfn_388(); /** - * @vftbl 397 + * @vftbl 389 * @symbol ?isHostingPlayer\@Player\@\@UEBA_NXZ */ virtual bool isHostingPlayer() const; /** - * @vftbl 398 + * @vftbl 390 * @symbol ?isLoading\@Player\@\@UEBA_NXZ */ virtual bool isLoading() const; /** - * @vftbl 399 + * @vftbl 391 * @symbol ?isPlayerInitialized\@Player\@\@UEBA_NXZ */ virtual bool isPlayerInitialized() const; /** - * @vftbl 400 - * @symbol __unk_vfn_400 + * @vftbl 392 + * @symbol __unk_vfn_392 */ - virtual void __unk_vfn_400(); + virtual void __unk_vfn_392(); /** - * @vftbl 401 + * @vftbl 393 * @symbol ?registerTrackedBoss\@Player\@\@UEAAXUActorUniqueID\@\@\@Z */ virtual void registerTrackedBoss(struct ActorUniqueID); /** - * @vftbl 402 + * @vftbl 394 * @symbol ?unRegisterTrackedBoss\@Player\@\@UEAAXUActorUniqueID\@\@\@Z */ virtual void unRegisterTrackedBoss(struct ActorUniqueID); /** - * @vftbl 403 + * @vftbl 395 * @symbol ?setPlayerGameType\@Player\@\@UEAAXW4GameType\@\@\@Z */ virtual void setPlayerGameType(enum class GameType); /** - * @vftbl 404 + * @vftbl 396 * @symbol ?initHUDContainerManager\@Player\@\@UEAAXXZ */ virtual void initHUDContainerManager(); /** - * @vftbl 405 + * @vftbl 397 * @symbol ?_crit\@Player\@\@UEAAXAEAVActor\@\@\@Z */ virtual void _crit(class Actor &); /** - * @vftbl 406 + * @vftbl 398 * @symbol ?getEventing\@Player\@\@UEBAPEAVIMinecraftEventing\@\@XZ */ virtual class IMinecraftEventing * getEventing() const; /** - * @vftbl 407 - * @symbol __unk_vfn_407 + * @vftbl 399 + * @symbol __unk_vfn_399 */ - virtual void __unk_vfn_407(); + virtual void __unk_vfn_399(); /** - * @vftbl 408 + * @vftbl 400 * @symbol ?sendEventPacket\@Player\@\@UEBAXAEAVEventPacket\@\@\@Z */ virtual void sendEventPacket(class EventPacket &) const; /** - * @vftbl 409 + * @vftbl 401 * @symbol ?addExperience\@Player\@\@UEAAXH\@Z */ virtual void addExperience(int); /** - * @vftbl 410 + * @vftbl 402 * @symbol ?addLevels\@Player\@\@UEAAXH\@Z */ virtual void addLevels(int); /** - * @vftbl 411 + * @vftbl 403 * @symbol ?setContainerData\@ServerPlayer\@\@UEAAXAEAVIContainerManager\@\@HH\@Z */ virtual void setContainerData(class IContainerManager &, int, int) = 0; /** - * @vftbl 412 + * @vftbl 404 * @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 413 + * @vftbl 405 * @symbol ?inventoryChanged\@Player\@\@UEAAXAEAVContainer\@\@HAEBVItemStack\@\@1_N\@Z */ virtual void inventoryChanged(class Container &, int, class ItemStack const &, class ItemStack const &, bool); /** - * @vftbl 414 + * @vftbl 406 * @symbol ?refreshContainer\@ServerPlayer\@\@UEAAXAEAVIContainerManager\@\@\@Z */ virtual void refreshContainer(class IContainerManager &) = 0; /** - * @vftbl 415 + * @vftbl 407 * @symbol ?deleteContainerManager\@Player\@\@UEAAXXZ */ virtual void deleteContainerManager(); /** - * @vftbl 416 + * @vftbl 408 * @symbol ?isActorRelevant\@Player\@\@UEAA_NAEBVActor\@\@\@Z */ virtual bool isActorRelevant(class Actor const &); /** - * @vftbl 417 + * @vftbl 409 * @symbol ?isTeacher\@ServerPlayer\@\@UEBA_NXZ */ virtual bool isTeacher() const = 0; /** - * @vftbl 418 + * @vftbl 410 * @symbol ?onSuspension\@Player\@\@UEAAXXZ */ virtual void onSuspension(); /** - * @vftbl 419 + * @vftbl 411 * @symbol ?onLinkedSlotsChanged\@Player\@\@UEAAXXZ */ virtual void onLinkedSlotsChanged(); /** - * @vftbl 420 + * @vftbl 412 * @symbol ?startCooldown\@Player\@\@UEAAXPEBVItem\@\@_N\@Z */ virtual void startCooldown(class Item const *, bool); /** - * @vftbl 421 + * @vftbl 413 * @symbol ?getItemCooldownLeft\@Player\@\@UEBAHAEBVHashedString\@\@\@Z */ virtual int getItemCooldownLeft(class HashedString const &) const; /** - * @vftbl 422 + * @vftbl 414 * @symbol ?getItemCooldownLeft\@Player\@\@UEBAH_K\@Z */ virtual int getItemCooldownLeft(unsigned __int64) const; /** - * @vftbl 423 + * @vftbl 415 * @symbol ?getMaxItemCooldownLeft\@Player\@\@UEBAHXZ */ virtual int getMaxItemCooldownLeft() const; /** - * @vftbl 424 + * @vftbl 416 * @symbol ?isItemOnCooldown\@Player\@\@UEBA_NAEBVHashedString\@\@\@Z */ virtual bool isItemOnCooldown(class HashedString const &) const; /** - * @vftbl 425 + * @vftbl 417 * @symbol ?sendInventoryTransaction\@ServerPlayer\@\@UEBAXAEBVInventoryTransaction\@\@\@Z */ virtual void sendInventoryTransaction(class InventoryTransaction const &) const = 0; /** - * @vftbl 426 + * @vftbl 418 * @symbol ?sendComplexInventoryTransaction\@ServerPlayer\@\@UEBAXV?$unique_ptr\@VComplexInventoryTransaction\@\@U?$default_delete\@VComplexInventoryTransaction\@\@\@std\@\@\@std\@\@\@Z */ virtual void sendComplexInventoryTransaction(std::unique_ptr) const = 0; /** - * @vftbl 427 + * @vftbl 419 * @symbol ?sendNetworkPacket\@Player\@\@UEBAXAEAVPacket\@\@\@Z */ virtual void sendNetworkPacket(class Packet &) const; /** - * @vftbl 428 + * @vftbl 420 * @symbol ?getPlayerEventCoordinator\@ServerPlayer\@\@UEAAAEAVPlayerEventCoordinator\@\@XZ */ virtual class PlayerEventCoordinator & getPlayerEventCoordinator() = 0; /** - * @vftbl 429 - * @symbol ?tryGetMoveInputHandler\@ServerPlayer\@\@UEBAPEAVMoveInputHandler\@\@XZ - */ - virtual class MoveInputHandler * tryGetMoveInputHandler() const = 0; - /** - * @vftbl 430 - * @symbol ?getInputMode\@ServerPlayer\@\@UEBA?AW4InputMode\@\@XZ - */ - virtual enum class InputMode getInputMode() const = 0; - /** - * @vftbl 431 - * @symbol ?getPlayMode\@ServerPlayer\@\@UEBA?AW4ClientPlayMode\@\@XZ - */ - virtual enum class ClientPlayMode getPlayMode() const = 0; - /** - * @vftbl 432 + * @vftbl 421 * @symbol ?reportMovementTelemetry\@Player\@\@UEAAXW4MovementEventType\@\@\@Z */ virtual void reportMovementTelemetry(enum class MovementEventType); /** - * @vftbl 433 - * @symbol __unk_vfn_433 + * @vftbl 422 + * @symbol __unk_vfn_422 */ - virtual void __unk_vfn_433(); + virtual void __unk_vfn_422(); /** - * @vftbl 434 + * @vftbl 423 * @symbol ?getXuid\@Player\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getXuid() const; /** - * @vftbl 435 + * @vftbl 424 * @symbol ?getMovementSettings\@Player\@\@UEBAAEBUPlayerMovementSettings\@\@XZ */ virtual struct PlayerMovementSettings const & getMovementSettings() const; /** - * @vftbl 436 - * @symbol __unk_vfn_436 + * @vftbl 425 + * @symbol __unk_vfn_425 */ - virtual void __unk_vfn_436(); + virtual void __unk_vfn_425(); /** - * @vftbl 437 + * @vftbl 426 * @symbol ?getMaxChunkBuildRadius\@Player\@\@UEBAEXZ */ virtual unsigned char getMaxChunkBuildRadius() const; /** - * @vftbl 438 + * @vftbl 427 * @symbol ?onMovePlayerPacketNormal\@Player\@\@MEAAXAEBVVec3\@\@AEBVVec2\@\@M\@Z */ virtual void onMovePlayerPacketNormal(class Vec3 const &, class Vec2 const &, float); /** - * @vftbl 439 + * @vftbl 428 * @symbol ?_createChunkSource\@Player\@\@MEAA?AV?$shared_ptr\@VChunkViewSource\@\@\@std\@\@AEAVChunkSource\@\@\@Z */ virtual class std::shared_ptr _createChunkSource(class ChunkSource &); /** - * @vftbl 440 + * @vftbl 429 * @symbol ?setAbilities\@Player\@\@UEAAXAEBVLayeredAbilities\@\@\@Z */ virtual void setAbilities(class LayeredAbilities const &); /** - * @vftbl 441 + * @vftbl 430 * @symbol ?getEditorPlayer\@ServerPlayer\@\@UEBA?AV?$NonOwnerPointer\@VIEditorPlayer\@Editor\@\@\@Bedrock\@\@XZ */ virtual class Bedrock::NonOwnerPointer getEditorPlayer() const = 0; /** - * @vftbl 442 + * @vftbl 431 * @symbol ?destroyEditorPlayer\@ServerPlayer\@\@UEAAXXZ */ virtual void destroyEditorPlayer() = 0; @@ -1259,10 +1219,6 @@ class Player : public Mob { * @symbol ?addSavedChunk\@Player\@\@UEAAXAEBVChunkPos\@\@\@Z */ MCVAPI void addSavedChunk(class ChunkPos const &); - /** - * @symbol ?canInteractWithOtherEntitiesInGame\@Player\@\@UEBA_NXZ - */ - MCVAPI bool canInteractWithOtherEntitiesInGame() const; /** * @symbol ?displayChatMessage\@Player\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ @@ -1384,14 +1340,14 @@ class Player : public Mob { * @symbol ?dropCursorSelectedItemOnDeath\@Player\@\@QEAAXXZ */ MCAPI void dropCursorSelectedItemOnDeath(); - /** - * @symbol ?eat\@Player\@\@QEAAXHM\@Z - */ - MCAPI void eat(int, float); /** * @symbol ?eat\@Player\@\@QEAAXAEBVItemStack\@\@\@Z */ MCAPI void eat(class ItemStack const &); + /** + * @symbol ?eat\@Player\@\@QEAAXHM\@Z + */ + MCAPI void eat(int, float); /** * @symbol ?equippedArmorItemCanBeMoved\@Player\@\@QEBA_NAEBVItemStack\@\@\@Z */ @@ -1512,10 +1468,6 @@ class Player : public Mob { * @symbol ?getMapIndex\@Player\@\@QEAAHXZ */ MCAPI int getMapIndex(); - /** - * @symbol ?getMoveInputHandler\@Player\@\@QEBAPEAVMoveInputHandler\@\@XZ - */ - MCAPI class MoveInputHandler * getMoveInputHandler() const; /** * @symbol ?getName\@Player\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ @@ -1576,14 +1528,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\@\@QEAAAEAVSerializedSkin\@\@XZ - */ - MCAPI class SerializedSkin & getSkin(); /** * @symbol ?getSkin\@Player\@\@QEBAAEBVSerializedSkin\@\@XZ */ MCAPI class SerializedSkin const & getSkin() const; + /** + * @symbol ?getSkin\@Player\@\@QEAAAEAVSerializedSkin\@\@XZ + */ + MCAPI class SerializedSkin & getSkin(); /** * @symbol ?getSleepRotation\@Player\@\@QEBAMXZ */ @@ -1596,22 +1548,18 @@ class Player : public Mob { * @symbol ?getSpawnPosition\@Player\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getSpawnPosition() const; - /** - * @symbol ?getSupplies\@Player\@\@QEAAAEAVPlayerInventory\@\@XZ - */ - MCAPI class PlayerInventory & getSupplies(); /** * @symbol ?getSupplies\@Player\@\@QEBAAEBVPlayerInventory\@\@XZ */ MCAPI class PlayerInventory const & getSupplies() const; /** - * @symbol ?getTrackedBosses\@Player\@\@QEAAAEBV?$vector\@UActorUniqueID\@\@V?$allocator\@UActorUniqueID\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getSupplies\@Player\@\@QEAAAEAVPlayerInventory\@\@XZ */ - MCAPI std::vector const & getTrackedBosses(); + MCAPI class PlayerInventory & getSupplies(); /** - * @symbol ?getUnmappedPlayerGameType\@Player\@\@QEBA?AW4GameType\@\@XZ + * @symbol ?getTrackedBosses\@Player\@\@QEAAAEBV?$vector\@UActorUniqueID\@\@V?$allocator\@UActorUniqueID\@\@\@std\@\@\@std\@\@XZ */ - MCAPI enum class GameType getUnmappedPlayerGameType() const; + MCAPI std::vector const & getTrackedBosses(); /** * @symbol ?getUsedPotion\@Player\@\@QEAA_NXZ */ @@ -1684,10 +1632,6 @@ class Player : public Mob { * @symbol ?isHurt\@Player\@\@QEAA_NXZ */ MCAPI bool isHurt(); - /** - * @symbol ?isInCreativeMode\@Player\@\@QEBA_NXZ - */ - MCAPI bool isInCreativeMode() const; /** * @symbol ?isInRaid\@Player\@\@QEBA_NXZ */ @@ -1864,6 +1808,10 @@ class Player : public Mob { * @symbol ?startGliding\@Player\@\@QEAAXXZ */ MCAPI void startGliding(); + /** + * @symbol ?startItemUseOn\@Player\@\@QEAAXEAEBVBlockPos\@\@0AEBVItemStack\@\@\@Z + */ + MCAPI void startItemUseOn(unsigned char, class BlockPos const &, class BlockPos const &, class ItemStack const &); /** * @symbol ?startUsingItem\@Player\@\@QEAAXAEBVItemStack\@\@H\@Z */ @@ -1872,6 +1820,10 @@ class Player : public Mob { * @symbol ?stopGliding\@Player\@\@QEAAXXZ */ MCAPI void stopGliding(); + /** + * @symbol ?stopItemUseOn\@Player\@\@QEAAXAEBVBlockPos\@\@AEBVItemStack\@\@\@Z + */ + MCAPI void stopItemUseOn(class BlockPos const &, class ItemStack const &); /** * @symbol ?stopUsingItem\@Player\@\@QEAAXXZ */ @@ -2040,10 +1992,6 @@ class Player : public Mob { * @symbol ?checkNeedAutoJump\@Player\@\@SA_NPEAUIPlayerMovementProxy\@\@MM\@Z */ MCAPI static bool checkNeedAutoJump(struct IPlayerMovementProxy *, float, float); - /** - * @symbol ?goDownInWater\@Player\@\@SAXAEAUIActorMovementProxy\@\@\@Z - */ - MCAPI static void goDownInWater(struct IActorMovementProxy &); /** * @symbol ?handleJumpEffects\@Player\@\@SAXAEAUIPlayerMovementProxy\@\@\@Z */ @@ -2070,6 +2018,10 @@ class Player : public Mob { MCAPI static class Player * tryGetFromEntity(class StackRefResultT, bool); //protected: + /** + * @symbol ?_canChangeGameType\@Player\@\@IEBA_NW4GameType\@\@\@Z + */ + MCAPI bool _canChangeGameType(enum class GameType) const; /** * @symbol ?_checkAndFixSpawnPosition\@Player\@\@IEBA_NAEAVVec3\@\@V?$vector\@V?$not_null\@PEAVBlockSource\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEAVBlockSource\@\@\@gsl\@\@\@std\@\@\@std\@\@_N2222\@Z */ diff --git a/LiteLoader/include/llapi/mc/PlayerActionPacket.hpp b/LiteLoader/include/llapi/mc/PlayerActionPacket.hpp index 1b73e08dfb..b007862bb2 100644 --- a/LiteLoader/include/llapi/mc/PlayerActionPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerActionPacket.hpp @@ -94,38 +94,38 @@ class PlayerActionPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PlayerActionPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PlayerActionPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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\@W4PlayerActionType\@\@AEBVBlockPos\@\@EVActorRuntimeID\@\@\@Z + */ + MCAPI PlayerActionPacket(enum class PlayerActionType, class BlockPos const &, unsigned char, class ActorRuntimeID); /** * @symbol ??0PlayerActionPacket\@\@QEAA\@W4PlayerActionType\@\@AEBVBlockPos\@\@HVActorRuntimeID\@\@\@Z */ MCAPI PlayerActionPacket(enum class PlayerActionType, class BlockPos const &, int, class ActorRuntimeID); /** - * @symbol ??0PlayerActionPacket\@\@QEAA\@XZ + * @symbol ??0PlayerActionPacket\@\@QEAA\@W4PlayerActionType\@\@VActorRuntimeID\@\@\@Z */ - MCAPI PlayerActionPacket(); + MCAPI PlayerActionPacket(enum class PlayerActionType, class ActorRuntimeID); /** - * @symbol ??0PlayerActionPacket\@\@QEAA\@W4PlayerActionType\@\@AEBVBlockPos\@\@EVActorRuntimeID\@\@\@Z + * @symbol ??0PlayerActionPacket\@\@QEAA\@W4PlayerActionType\@\@AEBVBlockPos\@\@1HVActorRuntimeID\@\@\@Z */ - MCAPI PlayerActionPacket(enum class PlayerActionType, class BlockPos const &, unsigned char, class ActorRuntimeID); + MCAPI PlayerActionPacket(enum class PlayerActionType, class BlockPos const &, class BlockPos const &, int, class ActorRuntimeID); /** - * @symbol ??0PlayerActionPacket\@\@QEAA\@W4PlayerActionType\@\@VActorRuntimeID\@\@\@Z + * @symbol ??0PlayerActionPacket\@\@QEAA\@XZ */ - MCAPI PlayerActionPacket(enum class PlayerActionType, class ActorRuntimeID); + MCAPI PlayerActionPacket(); }; diff --git a/LiteLoader/include/llapi/mc/PlayerArmorDamagePacket.hpp b/LiteLoader/include/llapi/mc/PlayerArmorDamagePacket.hpp index 0a7dae085d..75db11fa40 100644 --- a/LiteLoader/include/llapi/mc/PlayerArmorDamagePacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerArmorDamagePacket.hpp @@ -52,9 +52,9 @@ class PlayerArmorDamagePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PlayerArmorDamagePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PlayerArmorDamagePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 9d9f3f5baf..d8b9764fa9 100644 --- a/LiteLoader/include/llapi/mc/PlayerAuthInputPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerAuthInputPacket.hpp @@ -58,9 +58,9 @@ enum class InputData; virtual bool isValid() const; /** * @vftbl 7 - * @symbol ?_read\@PlayerAuthInputPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PlayerAuthInputPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERAUTHINPUTPACKET /** * @symbol __unk_destructor_-1 @@ -87,10 +87,6 @@ enum class InputData; * @symbol ?readIntoComponent\@PlayerAuthInputPacket\@\@QEBA?AUPlayerActionComponent\@\@XZ */ MCAPI struct PlayerActionComponent readIntoComponent() const; - /** - * @symbol ?setInput\@PlayerAuthInputPacket\@\@QEAAXW4InputData\@1\@_N\@Z - */ - MCAPI void setInput(enum class PlayerAuthInputPacket::InputData, bool); /** * @symbol ?takeCopy\@PlayerAuthInputPacket\@\@QEBA?AV1\@XZ */ diff --git a/LiteLoader/include/llapi/mc/PlayerDeathManager.hpp b/LiteLoader/include/llapi/mc/PlayerDeathManager.hpp new file mode 100644 index 0000000000..b9af0dc113 --- /dev/null +++ b/LiteLoader/include/llapi/mc/PlayerDeathManager.hpp @@ -0,0 +1,57 @@ +/** + * @file PlayerDeathManager.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Bedrock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class PlayerDeathManager { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PLAYERDEATHMANAGER +public: + class PlayerDeathManager& operator=(class PlayerDeathManager const &) = delete; + PlayerDeathManager(class PlayerDeathManager const &) = delete; + PlayerDeathManager() = delete; +#endif + +public: + /** + * @symbol ??0PlayerDeathManager\@\@QEAA\@V?$unique_ptr\@VIPlayerDeathManagerProxy\@\@U?$default_delete\@VIPlayerDeathManagerProxy\@\@\@std\@\@\@std\@\@\@Z + */ + MCAPI PlayerDeathManager(std::unique_ptr); + /** + * @symbol ?playerDied\@PlayerDeathManager\@\@QEAAXAEAVPlayer\@\@AEBVActorDamageSource\@\@\@Z + */ + MCAPI void playerDied(class Player &, class ActorDamageSource const &); + /** + * @symbol ?registerOnPlayerDeathCallback\@PlayerDeathManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEAVPlayer\@\@\@Z\@std\@\@\@Z + */ + MCAPI class Bedrock::PubSub::Subscription registerOnPlayerDeathCallback(class std::function); + /** + * @symbol ?setPacketSender\@PlayerDeathManager\@\@QEAAXAEAVPacketSender\@\@\@Z + */ + MCAPI void setPacketSender(class PacketSender &); + /** + * @symbol ??1PlayerDeathManager\@\@QEAA\@XZ + */ + MCAPI ~PlayerDeathManager(); + +//private: + /** + * @symbol ?_getPlayerDeathManagerProxy\@PlayerDeathManager\@\@AEBAAEAVIPlayerDeathManagerProxy\@\@XZ + */ + MCAPI class IPlayerDeathManagerProxy & _getPlayerDeathManagerProxy() const; + +private: + +}; diff --git a/LiteLoader/include/llapi/mc/PlayerDeathManagerProxy.hpp b/LiteLoader/include/llapi/mc/PlayerDeathManagerProxy.hpp new file mode 100644 index 0000000000..b4573289c1 --- /dev/null +++ b/LiteLoader/include/llapi/mc/PlayerDeathManagerProxy.hpp @@ -0,0 +1,47 @@ +/** + * @file PlayerDeathManagerProxy.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class PlayerDeathManagerProxy { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PLAYERDEATHMANAGERPROXY +public: + class PlayerDeathManagerProxy& operator=(class PlayerDeathManagerProxy const &) = delete; + PlayerDeathManagerProxy(class PlayerDeathManagerProxy const &) = delete; + PlayerDeathManagerProxy() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?fetchActor\@PlayerDeathManagerProxy\@\@UEBAPEAVActor\@\@UActorUniqueID\@\@\@Z + */ + virtual class Actor * fetchActor(struct ActorUniqueID) const; + /** + * @vftbl 2 + * @symbol ?shouldShowDeathMessages\@PlayerDeathManagerProxy\@\@UEBA_NXZ + */ + virtual bool shouldShowDeathMessages() const; + /** + * @symbol ??0PlayerDeathManagerProxy\@\@QEAA\@AEAVServerLevel\@\@\@Z + */ + MCAPI PlayerDeathManagerProxy(class ServerLevel &); + +}; diff --git a/LiteLoader/include/llapi/mc/PlayerEnchantOptionsPacket.hpp b/LiteLoader/include/llapi/mc/PlayerEnchantOptionsPacket.hpp index 2378b32a0d..52314d728e 100644 --- a/LiteLoader/include/llapi/mc/PlayerEnchantOptionsPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerEnchantOptionsPacket.hpp @@ -52,9 +52,9 @@ class PlayerEnchantOptionsPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PlayerEnchantOptionsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PlayerEnchantOptionsPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERENCHANTOPTIONSPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/PlayerEventListener.hpp b/LiteLoader/include/llapi/mc/PlayerEventListener.hpp index ab938ef656..0e6c1ade6c 100644 --- a/LiteLoader/include/llapi/mc/PlayerEventListener.hpp +++ b/LiteLoader/include/llapi/mc/PlayerEventListener.hpp @@ -103,9 +103,9 @@ class PlayerEventListener { */ MCVAPI enum class EventResult onPlayerEquippedArmor(class Player &, class ItemDescriptor const &); /** - * @symbol ?onPlayerInput\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAUIPlayerMovementProxy\@\@AEAVMoveInputHandler\@\@\@Z + * @symbol ?onPlayerInput\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAUIPlayerMovementProxy\@\@\@Z */ - MCVAPI enum class EventResult onPlayerInput(struct IPlayerMovementProxy &, class MoveInputHandler &); + MCVAPI enum class EventResult onPlayerInput(struct IPlayerMovementProxy &); /** * @symbol ?onPlayerItemEquipped\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVItemInstance\@\@H\@Z */ @@ -162,6 +162,10 @@ class PlayerEventListener { * @symbol ?onPlayerSlide\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@\@Z */ MCVAPI enum class EventResult onPlayerSlide(class Player &); + /** + * @symbol ?onPlayerSmithiedItem\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVItemDescriptor\@\@\@Z + */ + MCVAPI enum class EventResult onPlayerSmithiedItem(class Player &, class ItemDescriptor const &); /** * @symbol ?onPlayerStartRiding\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEAVActor\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PlayerFetchUtils.hpp b/LiteLoader/include/llapi/mc/PlayerFetchUtils.hpp index f8614f9ccb..4efb25486d 100644 --- a/LiteLoader/include/llapi/mc/PlayerFetchUtils.hpp +++ b/LiteLoader/include/llapi/mc/PlayerFetchUtils.hpp @@ -16,6 +16,10 @@ namespace PlayerFetchUtils { #define AFTER_EXTRA #undef AFTER_EXTRA + /** + * @symbol ?findActivePlayerByActorUniqueID\@PlayerFetchUtils\@\@YAPEAVPlayer\@\@AEBVGameplayUserManager\@\@UActorUniqueID\@\@\@Z + */ + MCAPI class Player * findActivePlayerByActorUniqueID(class GameplayUserManager const &, struct ActorUniqueID); /** * @symbol ?findPlayer\@PlayerFetchUtils\@\@YAPEAVPlayer\@\@AEBVGameplayUserManager\@\@V?$function\@$$A6A_NAEBVPlayer\@\@\@Z\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PlayerFogPacket.hpp b/LiteLoader/include/llapi/mc/PlayerFogPacket.hpp index 5e421ef17b..af39702667 100644 --- a/LiteLoader/include/llapi/mc/PlayerFogPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerFogPacket.hpp @@ -52,9 +52,9 @@ class PlayerFogPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PlayerFogPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PlayerFogPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERFOGPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/PlayerGameTypeUtility.hpp b/LiteLoader/include/llapi/mc/PlayerGameTypeUtility.hpp index 22ee63e65c..6886d14c06 100644 --- a/LiteLoader/include/llapi/mc/PlayerGameTypeUtility.hpp +++ b/LiteLoader/include/llapi/mc/PlayerGameTypeUtility.hpp @@ -20,12 +20,24 @@ namespace PlayerGameTypeUtility { #undef AFTER_EXTRA /** - * @symbol ?isCreative\@PlayerGameTypeUtility\@\@YA_NAEBUPlayerGameTypeComponent\@\@\@Z + * @symbol ?isAdventure\@PlayerGameTypeUtility\@\@YA_NW4GameType\@\@0\@Z */ - MCAPI bool isCreative(struct PlayerGameTypeComponent const &); + MCAPI bool isAdventure(enum class GameType, enum class GameType); /** - * @symbol ?isSpectator\@PlayerGameTypeUtility\@\@YA_NAEBUPlayerGameTypeComponent\@\@\@Z + * @symbol ?isCreative\@PlayerGameTypeUtility\@\@YA_NW4GameType\@\@0\@Z */ - MCAPI bool isSpectator(struct PlayerGameTypeComponent const &); + MCAPI bool isCreative(enum class GameType, enum class GameType); + /** + * @symbol ?isSpectator\@PlayerGameTypeUtility\@\@YA_NW4GameType\@\@0\@Z + */ + MCAPI bool isSpectator(enum class GameType, enum class GameType); + /** + * @symbol ?isSurvival\@PlayerGameTypeUtility\@\@YA_NW4GameType\@\@0\@Z + */ + MCAPI bool isSurvival(enum class GameType, enum class GameType); + /** + * @symbol ?isWorldBuilderBedrock\@PlayerGameTypeUtility\@\@YA_NAEBUAbilitiesComponent\@\@W4GameType\@\@1\@Z + */ + MCAPI bool isWorldBuilderBedrock(struct AbilitiesComponent const &, enum class GameType, enum class GameType); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PlayerHotbarPacket.hpp b/LiteLoader/include/llapi/mc/PlayerHotbarPacket.hpp index 63467b2ce3..ccaf3c5419 100644 --- a/LiteLoader/include/llapi/mc/PlayerHotbarPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerHotbarPacket.hpp @@ -51,9 +51,9 @@ class PlayerHotbarPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PlayerHotbarPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PlayerHotbarPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERHOTBARPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/PlayerInputPacket.hpp b/LiteLoader/include/llapi/mc/PlayerInputPacket.hpp index 38605d48bd..e04cfab952 100644 --- a/LiteLoader/include/llapi/mc/PlayerInputPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerInputPacket.hpp @@ -51,9 +51,9 @@ class PlayerInputPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PlayerInputPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PlayerInputPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0PlayerInputPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/PlayerListEntry.hpp b/LiteLoader/include/llapi/mc/PlayerListEntry.hpp index 3e70d3857b..5c5bed24f6 100644 --- a/LiteLoader/include/llapi/mc/PlayerListEntry.hpp +++ b/LiteLoader/include/llapi/mc/PlayerListEntry.hpp @@ -41,14 +41,14 @@ class PlayerListEntry { * @symbol ??0PlayerListEntry\@\@QEAA\@XZ */ MCAPI PlayerListEntry(); - /** - * @symbol ??0PlayerListEntry\@\@QEAA\@AEBVPlayer\@\@\@Z - */ - MCAPI PlayerListEntry(class Player const &); /** * @symbol ??0PlayerListEntry\@\@QEAA\@VUUID\@mce\@\@\@Z */ MCAPI PlayerListEntry(class mce::UUID); + /** + * @symbol ??0PlayerListEntry\@\@QEAA\@AEBVPlayer\@\@\@Z + */ + MCAPI PlayerListEntry(class Player const &); /** * @symbol ?clone\@PlayerListEntry\@\@QEBA?AV1\@XZ */ diff --git a/LiteLoader/include/llapi/mc/PlayerListManager.hpp b/LiteLoader/include/llapi/mc/PlayerListManager.hpp index 993d972a32..448b1eab02 100644 --- a/LiteLoader/include/llapi/mc/PlayerListManager.hpp +++ b/LiteLoader/include/llapi/mc/PlayerListManager.hpp @@ -20,10 +20,13 @@ class PlayerListManager { public: class PlayerListManager& operator=(class PlayerListManager const &) = delete; PlayerListManager(class PlayerListManager const &) = delete; - PlayerListManager() = delete; #endif public: + /** + * @symbol ??0PlayerListManager\@\@QEAA\@XZ + */ + MCAPI PlayerListManager(); /** * @symbol ?getPlayerList\@PlayerListManager\@\@QEAAAEAV?$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 */ @@ -41,12 +44,28 @@ class PlayerListManager { */ MCAPI std::string const & getPlayerXUID(class mce::UUID const &) const; /** - * @symbol ?removeByUUID\@PlayerListManager\@\@QEAAXAEBVUUID\@mce\@\@\@Z + * @symbol ?initializeWithGameplayUserManagerOnServer\@PlayerListManager\@\@QEAAXAEAVGameplayUserManager\@\@\@Z */ - MCAPI void removeByUUID(class mce::UUID const &); + MCAPI void initializeWithGameplayUserManagerOnServer(class GameplayUserManager &); + /** + * @symbol ?setPacketSender\@PlayerListManager\@\@QEAAXAEAVPacketSender\@\@\@Z + */ + MCAPI void setPacketSender(class PacketSender &); /** * @symbol ??1PlayerListManager\@\@QEAA\@XZ */ MCAPI ~PlayerListManager(); +//private: + /** + * @symbol ?_onAnyGameplayUsersRemoved\@PlayerListManager\@\@AEAAXXZ + */ + MCAPI void _onAnyGameplayUsersRemoved(); + /** + * @symbol ?_onGameplayUserRemoved\@PlayerListManager\@\@AEAAXAEAVEntityContext\@\@\@Z + */ + MCAPI void _onGameplayUserRemoved(class EntityContext &); + +private: + }; diff --git a/LiteLoader/include/llapi/mc/PlayerListPacket.hpp b/LiteLoader/include/llapi/mc/PlayerListPacket.hpp index 9a7c7a6037..3c1971b7bc 100644 --- a/LiteLoader/include/llapi/mc/PlayerListPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerListPacket.hpp @@ -62,14 +62,14 @@ class PlayerListPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 4 - * @symbol ?readExtended\@PlayerListPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@PlayerListPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult read(class ReadOnlyBinaryStream &); /** * @vftbl 7 - * @symbol ?_read\@PlayerListPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PlayerListPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERLISTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/PlayerMoveInput.hpp b/LiteLoader/include/llapi/mc/PlayerMoveInput.hpp new file mode 100644 index 0000000000..a9a42a390c --- /dev/null +++ b/LiteLoader/include/llapi/mc/PlayerMoveInput.hpp @@ -0,0 +1,28 @@ +/** + * @file PlayerMoveInput.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace PlayerMoveInput { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?initializePlayer\@PlayerMoveInput\@\@YAXAEAVEntityContext\@\@\@Z + */ + MCAPI void initializePlayer(class EntityContext &); + /** + * @symbol ?isSneakDown\@PlayerMoveInput\@\@YA_NAEBVEntityContext\@\@\@Z + */ + MCAPI bool isSneakDown(class EntityContext const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PlayerMovement.hpp b/LiteLoader/include/llapi/mc/PlayerMovement.hpp index 810755c445..7456a4bb7c 100644 --- a/LiteLoader/include/llapi/mc/PlayerMovement.hpp +++ b/LiteLoader/include/llapi/mc/PlayerMovement.hpp @@ -33,10 +33,18 @@ namespace PlayerMovement { * @symbol ?calculateMoveVector\@PlayerMovement\@\@YA?AVVec2\@\@AEBUMoveInputState\@\@AEAUIPlayerMovementProxy\@\@\@Z */ MCAPI class Vec2 calculateMoveVector(struct MoveInputState const &, struct IPlayerMovementProxy &); + /** + * @symbol ?clearInputState\@PlayerMovement\@\@YAXAEAUMoveInputComponent\@\@\@Z + */ + MCAPI void clearInputState(struct MoveInputComponent &); /** * @symbol ?getControllingPassengerID\@PlayerMovement\@\@YA?AUActorUniqueID\@\@AEBV?$vector\@UStrictActorIDEntityContextPair\@\@V?$allocator\@UStrictActorIDEntityContextPair\@\@\@std\@\@\@std\@\@H\@Z */ MCAPI struct ActorUniqueID getControllingPassengerID(std::vector const &, int); + /** + * @symbol ?getInputMode\@PlayerMovement\@\@YA?AW4InputMode\@\@AEBVEntityContext\@\@\@Z + */ + MCAPI enum class InputMode getInputMode(class EntityContext const &); /** * @symbol ?getPositionMode\@PlayerMovement\@\@YA?AW4PositionMode\@PlayerPositionModeComponent\@\@AEBVEntityContext\@\@\@Z */ @@ -49,21 +57,5 @@ namespace PlayerMovement { * @symbol ?setPositionMode\@PlayerMovement\@\@YAXAEAVEntityContext\@\@W4PositionMode\@PlayerPositionModeComponent\@\@\@Z */ MCAPI void setPositionMode(class EntityContext &, enum class PlayerPositionModeComponent::PositionMode); - /** - * @symbol ?updatePlayerOnInput\@PlayerMovement\@\@YAXAEAUIPlayerMovementProxy\@\@AEAVMoveInputHandler\@\@AEAVVec3\@\@\@Z - */ - MCAPI void updatePlayerOnInput(struct IPlayerMovementProxy &, class MoveInputHandler &, class Vec3 &); - /** - * @symbol ?updatePlayerRiding\@PlayerMovement\@\@YAXAEAUIPlayerMovementProxy\@\@AEAVMoveInputHandler\@\@\@Z - */ - MCAPI void updatePlayerRiding(struct IPlayerMovementProxy &, class MoveInputHandler &); - /** - * @symbol ?updatePlayerState\@PlayerMovement\@\@YAXAEAUIPlayerMovementProxy\@\@AEAVMoveInputHandler\@\@AEBVIConstBlockSource\@\@\@Z - */ - MCAPI void updatePlayerState(struct IPlayerMovementProxy &, class MoveInputHandler &, class IConstBlockSource const &); - /** - * @symbol ?updateSwimTravel\@PlayerMovement\@\@YAXAEAUIPlayerMovementProxy\@\@AEAVMoveInputHandler\@\@AEAVVec3\@\@AEBVIConstBlockSource\@\@\@Z - */ - MCAPI void updateSwimTravel(struct IPlayerMovementProxy &, class MoveInputHandler &, class Vec3 &, class IConstBlockSource const &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PlayerMovementStatsEventSystem.hpp b/LiteLoader/include/llapi/mc/PlayerMovementStatsEventSystem.hpp index eb7ae6f7c5..23cce26ba8 100644 --- a/LiteLoader/include/llapi/mc/PlayerMovementStatsEventSystem.hpp +++ b/LiteLoader/include/llapi/mc/PlayerMovementStatsEventSystem.hpp @@ -28,5 +28,9 @@ 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/PlayerSkinPacket.hpp b/LiteLoader/include/llapi/mc/PlayerSkinPacket.hpp index ff762565dd..4cacdfff63 100644 --- a/LiteLoader/include/llapi/mc/PlayerSkinPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerSkinPacket.hpp @@ -51,14 +51,14 @@ class PlayerSkinPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 4 - * @symbol ?readExtended\@PlayerSkinPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@PlayerSkinPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult read(class ReadOnlyBinaryStream &); /** * @vftbl 7 - * @symbol ?_read\@PlayerSkinPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PlayerSkinPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERSKINPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/PlayerSleepManager.hpp b/LiteLoader/include/llapi/mc/PlayerSleepManager.hpp index 420aecd32a..955d79c4a1 100644 --- a/LiteLoader/include/llapi/mc/PlayerSleepManager.hpp +++ b/LiteLoader/include/llapi/mc/PlayerSleepManager.hpp @@ -33,6 +33,35 @@ class PlayerSleepManager { * @symbol ?updateSleepingPlayerList\@PlayerSleepManager\@\@UEAAXXZ */ virtual void updateSleepingPlayerList(); + /** + * @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 __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(); + /** + * @symbol ?getPlayerSleepStatus\@PlayerSleepManager\@\@QEBAAEBUPlayerSleepStatus\@\@XZ + */ + MCAPI struct PlayerSleepStatus const & getPlayerSleepStatus() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERSLEEPMANAGER /** * @symbol __unk_destructor_-1 @@ -47,6 +76,10 @@ class PlayerSleepManager { * @symbol ?getPlayerSleepStatus\@PlayerSleepManager\@\@QEBAAEBUPlayerSleepStatus\@\@XZ */ MCAPI struct PlayerSleepStatus const & getPlayerSleepStatus() const; + /** + * @symbol ?initializeWithGameplayUserManager\@PlayerSleepManager\@\@QEAAXAEAVGameplayUserManager\@\@\@Z + */ + MCAPI void initializeWithGameplayUserManager(class GameplayUserManager &); /** * @symbol ?setSleepStatus\@PlayerSleepManager\@\@QEAAXAEBUPlayerSleepStatus\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PlayerStartItemCooldownPacket.hpp b/LiteLoader/include/llapi/mc/PlayerStartItemCooldownPacket.hpp index e39c78cd24..71a13159a2 100644 --- a/LiteLoader/include/llapi/mc/PlayerStartItemCooldownPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerStartItemCooldownPacket.hpp @@ -49,9 +49,9 @@ class PlayerStartItemCooldownPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PlayerStartItemCooldownPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PlayerStartItemCooldownPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 b7a298916d..dd9190b773 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\@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 ??0PlayerTickComponent\@\@QEAA\@V?$unique_ptr\@UIPlayerTickPolicy\@\@U?$default_delete\@UIPlayerTickPolicy\@\@\@std\@\@\@std\@\@\@Z + */ + MCAPI PlayerTickComponent(std::unique_ptr); /** * @symbol ??4PlayerTickComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PlayerUIContainer.hpp b/LiteLoader/include/llapi/mc/PlayerUIContainer.hpp index b8a35320d9..039a93cadc 100644 --- a/LiteLoader/include/llapi/mc/PlayerUIContainer.hpp +++ b/LiteLoader/include/llapi/mc/PlayerUIContainer.hpp @@ -35,16 +35,16 @@ class PlayerUIContainer : public SimpleContainer { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @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(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERUICONTAINER /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/PlayerUtils.hpp b/LiteLoader/include/llapi/mc/PlayerUtils.hpp index 9eb5e0b3ec..d4abc98c75 100644 --- a/LiteLoader/include/llapi/mc/PlayerUtils.hpp +++ b/LiteLoader/include/llapi/mc/PlayerUtils.hpp @@ -20,6 +20,10 @@ namespace PlayerUtils { * @symbol ?addItem\@PlayerUtils\@\@YAXAEAVPlayer\@\@AEAVItemStack\@\@\@Z */ MCAPI void addItem(class Player &, class ItemStack &); + /** + * @symbol ?getPlayerColor\@PlayerUtils\@\@YA?AVColor\@mce\@\@AEBVPlayer\@\@\@Z + */ + MCAPI class mce::Color getPlayerColor(class Player const &); /** * @symbol ?replaceCurrentItem\@PlayerUtils\@\@YAXAEAVPlayer\@\@AEAVItemStack\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PodzolBlock.hpp b/LiteLoader/include/llapi/mc/PodzolBlock.hpp index 3fdbe9c4cc..33d6dc1462 100644 --- a/LiteLoader/include/llapi/mc/PodzolBlock.hpp +++ b/LiteLoader/include/llapi/mc/PodzolBlock.hpp @@ -40,16 +40,21 @@ class PodzolBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class PodzolBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class PodzolBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,107 +131,102 @@ class PodzolBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @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 ed7ee38596..222cc81fcc 100644 --- a/LiteLoader/include/llapi/mc/PointedDripstoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/PointedDripstoneBlock.hpp @@ -5,7 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "HeavyBlock.hpp" +#include "FallingBlock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +16,7 @@ * @brief MC class PointedDripstoneBlock. * */ -class PointedDripstoneBlock : public HeavyBlock { +class PointedDripstoneBlock : public FallingBlock { #define AFTER_EXTRA // Add Member There @@ -55,16 +55,21 @@ class PointedDripstoneBlock : public HeavyBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -76,10 +81,10 @@ class PointedDripstoneBlock : public HeavyBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -111,10 +116,10 @@ class PointedDripstoneBlock : public HeavyBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -141,182 +146,177 @@ class PointedDripstoneBlock : public HeavyBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@PointedDripstoneBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@PointedDripstoneBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@PointedDripstoneBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 153 + * @vftbl 151 * @symbol ?init\@PointedDripstoneBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?onFallOn\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 + * @vftbl 171 * @symbol ?randomTick\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@PointedDripstoneBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 195 + * @vftbl 194 * @symbol ?getDustColor\@PointedDripstoneBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 196 + * @vftbl 195 * @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 197 - * @symbol __unk_vfn_197 + * @vftbl 196 + * @symbol __unk_vfn_196 */ - virtual void __unk_vfn_197(); + virtual void __unk_vfn_196(); /** - * @vftbl 198 + * @vftbl 197 * @symbol ?onLand\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onLand(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 200 + * @vftbl 199 * @symbol ?startFalling\@PointedDripstoneBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@_N\@Z */ virtual void startFalling(class BlockSource &, class BlockPos const &, class Block const &, bool) const; @@ -362,6 +362,10 @@ class PointedDripstoneBlock : public HeavyBlock { * @symbol ?growStalagmite\@PointedDripstoneBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static void growStalagmite(class BlockSource &, class BlockPos const &); + /** + * @symbol ?isPointedDripstoneWithDirection\@PointedDripstoneBlock\@\@SA_NAEBVBlock\@\@E\@Z + */ + MCAPI static bool isPointedDripstoneWithDirection(class Block const &, unsigned char); //private: /** @@ -388,6 +392,10 @@ class PointedDripstoneBlock : public HeavyBlock { * @symbol ?_createDripstone\@PointedDripstoneBlock\@\@CAXAEAVBlockSource\@\@AEBVBlockPos\@\@EW4DripstoneThickness\@\@\@Z */ MCAPI static void _createDripstone(class BlockSource &, class BlockPos const &, unsigned char, enum class DripstoneThickness); + /** + * @symbol ?_createMergedTips\@PointedDripstoneBlock\@\@CAXAEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI static void _createMergedTips(class BlockSource &, class Block const &, class BlockPos const &); /** * @symbol ?_findBlockVertically\@PointedDripstoneBlock\@\@CA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@EV?$function\@$$A6A_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z\@3\@2H\@Z */ diff --git a/LiteLoader/include/llapi/mc/PolarBear.hpp b/LiteLoader/include/llapi/mc/PolarBear.hpp index d95277caf4..c86d5085bf 100644 --- a/LiteLoader/include/llapi/mc/PolarBear.hpp +++ b/LiteLoader/include/llapi/mc/PolarBear.hpp @@ -37,135 +37,130 @@ class PolarBear : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@PolarBear\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 171 + * @vftbl 169 * @symbol ?canFreeze\@PolarBear\@\@UEBA_NXZ */ virtual bool canFreeze() const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 + */ + virtual void __unk_vfn_176(); + /** + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); - /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0PolarBear\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PortalBlock.hpp b/LiteLoader/include/llapi/mc/PortalBlock.hpp index d806fd3fc1..531c1be746 100644 --- a/LiteLoader/include/llapi/mc/PortalBlock.hpp +++ b/LiteLoader/include/llapi/mc/PortalBlock.hpp @@ -45,16 +45,21 @@ class PortalBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -67,14 +72,14 @@ class PortalBlock : public BlockLegacy { virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol __unk_vfn_34 + * @symbol ?isWaterBlocking\@PortalBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_34(); + virtual bool isWaterBlocking() const; /** * @vftbl 35 - * @symbol ?isWaterBlocking\@PortalBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_35 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +111,10 @@ class PortalBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,15 +141,15 @@ class PortalBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -152,139 +157,134 @@ class PortalBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@PortalBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 90 + * @vftbl 89 * @symbol ?mayPick\@PortalBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z */ virtual bool mayPick(class BlockSource const &, class Block const &, bool) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@PortalBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 113 + * @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 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 143 + * @vftbl 141 * @symbol ?getVisualShapeInWorld\@PortalBlock\@\@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 152 + * @vftbl 150 * @symbol ?animateTick\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #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 103c2e15e5..1ec3ca515c 100644 --- a/LiteLoader/include/llapi/mc/PositionTrackingDBClientRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/PositionTrackingDBClientRequestPacket.hpp @@ -51,9 +51,9 @@ class PositionTrackingDBClientRequestPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PositionTrackingDBClientRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PositionTrackingDBClientRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 b7b60c37ba..26fd6804b3 100644 --- a/LiteLoader/include/llapi/mc/PositionTrackingDBServerBroadcastPacket.hpp +++ b/LiteLoader/include/llapi/mc/PositionTrackingDBServerBroadcastPacket.hpp @@ -51,9 +51,9 @@ class PositionTrackingDBServerBroadcastPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PositionTrackingDBServerBroadcastPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PositionTrackingDBServerBroadcastPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_POSITIONTRACKINGDBSERVERBROADCASTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/PotatoBlock.hpp b/LiteLoader/include/llapi/mc/PotatoBlock.hpp index f864eec4f6..6457c5dce9 100644 --- a/LiteLoader/include/llapi/mc/PotatoBlock.hpp +++ b/LiteLoader/include/llapi/mc/PotatoBlock.hpp @@ -45,16 +45,21 @@ class PotatoBlock : public CropBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class PotatoBlock : public CropBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class PotatoBlock : public CropBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,120 +136,110 @@ class PotatoBlock : public CropBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 102 + * @vftbl 101 * @symbol ?spawnResources\@PotatoBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@PotatoBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 - */ - virtual void __unk_vfn_166(); - /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_164(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_165(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_166(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_169(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_173(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_177(); /** - * @vftbl 195 - * @symbol __unk_vfn_195 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_195(); + virtual void __unk_vfn_186(); /** * @vftbl 196 * @symbol ?getBaseSeed\@PotatoBlock\@\@UEBA?BVItemInstance\@\@XZ diff --git a/LiteLoader/include/llapi/mc/PotionItem.hpp b/LiteLoader/include/llapi/mc/PotionItem.hpp index b91b7ad2a8..90f361ea13 100644 --- a/LiteLoader/include/llapi/mc/PotionItem.hpp +++ b/LiteLoader/include/llapi/mc/PotionItem.hpp @@ -37,11 +37,6 @@ class PotionItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -57,6 +52,11 @@ class PotionItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -143,22 +143,32 @@ class PotionItem : public Item { */ virtual std::string buildEffectDescriptionName(class ItemStackBase const &) const; /** - * @vftbl 117 + * @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\@PotionItem\@\@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 118 + * @vftbl 120 * @symbol ?getIconInfo\@PotionItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 132 + * @vftbl 134 * @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 133 + * @vftbl 135 * @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 e2373fe2b1..fba3d7bf03 100644 --- a/LiteLoader/include/llapi/mc/PowderSnowBlock.hpp +++ b/LiteLoader/include/llapi/mc/PowderSnowBlock.hpp @@ -60,6 +60,11 @@ class PowderSnowBlock : public BlockLegacy { * @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 @@ -67,14 +72,14 @@ class PowderSnowBlock : public BlockLegacy { virtual void __unk_vfn_29(); /** * @vftbl 30 - * @symbol __unk_vfn_30 + * @symbol ?isClimbable\@PowderSnowBlock\@\@UEBA_NAEBUIActorMovementProxy\@\@\@Z */ - virtual void __unk_vfn_30(); + virtual bool isClimbable(struct IActorMovementProxy const &) const; /** * @vftbl 31 - * @symbol ?isClimbable\@PowderSnowBlock\@\@UEBA_NAEBUIActorMovementProxy\@\@\@Z + * @symbol __unk_vfn_31 */ - virtual bool isClimbable(struct IActorMovementProxy const &) const; + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -87,14 +92,14 @@ class PowderSnowBlock : public BlockLegacy { virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol __unk_vfn_34 + * @symbol ?isWaterBlocking\@PowderSnowBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_34(); + virtual bool isWaterBlocking() const; /** * @vftbl 35 - * @symbol ?isWaterBlocking\@PowderSnowBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_35 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -126,10 +131,10 @@ class PowderSnowBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -156,20 +161,20 @@ class PowderSnowBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 52 + * @symbol ?canBeAscendedByJumping\@PowderSnowBlock\@\@UEBA_NAEBVActor\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_49(); + virtual bool canBeAscendedByJumping(class Actor const &, class BlockPos const &) const; /** * @vftbl 53 - * @symbol ?canBeAscendedByJumping\@PowderSnowBlock\@\@UEBA_NAEBVActor\@\@AEBVBlockPos\@\@\@Z + * @symbol __unk_vfn_53 */ - virtual bool canBeAscendedByJumping(class Actor const &, class BlockPos const &) const; + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -177,114 +182,109 @@ class PowderSnowBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@PowderSnowBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 96 + * @vftbl 95 * @symbol ?breaksFallingBlocks\@PowderSnowBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@PowderSnowBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 113 + * @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 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + 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 170 * @symbol ?onFallOn\@PowderSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #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 c890a78e5e..b13f01cc39 100644 --- a/LiteLoader/include/llapi/mc/PoweredRailBlock.hpp +++ b/LiteLoader/include/llapi/mc/PoweredRailBlock.hpp @@ -40,16 +40,21 @@ class PoweredRailBlock : public BaseRailBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class PoweredRailBlock : public BaseRailBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class PoweredRailBlock : public BaseRailBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,115 +131,110 @@ class PoweredRailBlock : public BaseRailBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 73 + * @vftbl 72 * @symbol ?onRedstoneUpdate\@PoweredRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@PoweredRailBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 7945e191c8..3b721644cd 100644 --- a/LiteLoader/include/llapi/mc/PredictableProjectile.hpp +++ b/LiteLoader/include/llapi/mc/PredictableProjectile.hpp @@ -41,105 +41,100 @@ class PredictableProjectile : public Actor { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); - /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); #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 9a0c27fd70..4d5459f7de 100644 --- a/LiteLoader/include/llapi/mc/PressurePlateBlock.hpp +++ b/LiteLoader/include/llapi/mc/PressurePlateBlock.hpp @@ -40,16 +40,21 @@ class PressurePlateBlock : public BasePressurePlateBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class PressurePlateBlock : public BasePressurePlateBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class PressurePlateBlock : public BasePressurePlateBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,117 +131,112 @@ class PressurePlateBlock : public BasePressurePlateBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_169(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_173(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_177(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 - */ - virtual void __unk_vfn_187(); - /** - * @vftbl 196 + * @vftbl 195 * @symbol ?getSignalStrength\@PressurePlateBlock\@\@MEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getSignalStrength(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 197 + * @vftbl 196 * @symbol ?getSignalForData\@PressurePlateBlock\@\@MEBAHH\@Z */ virtual int getSignalForData(int) const; /** - * @vftbl 198 + * @vftbl 197 * @symbol ?getRedstoneSignal\@PressurePlateBlock\@\@MEBAHH\@Z */ virtual int getRedstoneSignal(int) const; diff --git a/LiteLoader/include/llapi/mc/PrimedTnt.hpp b/LiteLoader/include/llapi/mc/PrimedTnt.hpp index 04fc918bea..f2c33fedf4 100644 --- a/LiteLoader/include/llapi/mc/PrimedTnt.hpp +++ b/LiteLoader/include/llapi/mc/PrimedTnt.hpp @@ -57,150 +57,145 @@ class PrimedTnt : public PredictableProjectile { */ virtual enum class ActorType getOwnerEntityType(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 44 + * @vftbl 43 * @symbol ?teleportTo\@PrimedTnt\@\@UEAAXAEBVVec3\@\@_NHH1\@Z */ virtual void teleportTo(class Vec3 const &, bool, int, int, bool); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@PrimedTnt\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 79 + * @vftbl 77 * @symbol ?getShadowHeightOffs\@PrimedTnt\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 80 + * @vftbl 78 * @symbol ?getShadowRadius\@PrimedTnt\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_80(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_86(); /** - * @vftbl 95 + * @vftbl 93 * @symbol ?isPickable\@PrimedTnt\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_94(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_97(); + /** + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 169 + * @vftbl 167 * @symbol ?getSourceUniqueID\@PrimedTnt\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@PrimedTnt\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@PrimedTnt\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@PrimedTnt\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** * @symbol ??0PrimedTnt\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PrismarineBlock.hpp b/LiteLoader/include/llapi/mc/PrismarineBlock.hpp index 67bcb302a0..f047e8c75c 100644 --- a/LiteLoader/include/llapi/mc/PrismarineBlock.hpp +++ b/LiteLoader/include/llapi/mc/PrismarineBlock.hpp @@ -40,16 +40,21 @@ class PrismarineBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class PrismarineBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class PrismarineBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,127 +131,122 @@ class PrismarineBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@PrismarineBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@PrismarineBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 186 + * @vftbl 185 * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @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/PrivateKeyManager.hpp b/LiteLoader/include/llapi/mc/PrivateKeyManager.hpp index 5a4b8c7ab6..67e7a076bd 100644 --- a/LiteLoader/include/llapi/mc/PrivateKeyManager.hpp +++ b/LiteLoader/include/llapi/mc/PrivateKeyManager.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Crypto.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/include/llapi/mc/ProcessPlayerActionPacketSystem.hpp b/LiteLoader/include/llapi/mc/ProcessPlayerActionPacketSystem.hpp new file mode 100644 index 0000000000..5654e07790 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ProcessPlayerActionPacketSystem.hpp @@ -0,0 +1,36 @@ +/** + * @file ProcessPlayerActionPacketSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ProcessPlayerActionPacketSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PROCESSPLAYERACTIONPACKETSYSTEM +public: + class ProcessPlayerActionPacketSystem& operator=(class ProcessPlayerActionPacketSystem const &) = delete; + ProcessPlayerActionPacketSystem(class ProcessPlayerActionPacketSystem const &) = delete; + ProcessPlayerActionPacketSystem() = delete; +#endif + +public: + /** + * @symbol ?_foreachTransactionPacket\@ProcessPlayerActionPacketSystem\@\@SAXAEBUPlayerActionComponent\@\@_NAEBV?$function\@$$A6AXAEAVInventoryTransactionPacket\@\@\@Z\@std\@\@\@Z + */ + MCAPI static void _foreachTransactionPacket(struct PlayerActionComponent const &, bool, class std::function const &); + /** + * @symbol ?createSystem\@ProcessPlayerActionPacketSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createSystem(); + +}; diff --git a/LiteLoader/include/llapi/mc/ProcessPlayerActionPacketSystemImpl.hpp b/LiteLoader/include/llapi/mc/ProcessPlayerActionPacketSystemImpl.hpp new file mode 100644 index 0000000000..c2713feeb5 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ProcessPlayerActionPacketSystemImpl.hpp @@ -0,0 +1,24 @@ +/** + * @file ProcessPlayerActionPacketSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace ProcessPlayerActionPacketSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?doProcessPlayerActionPacket\@ProcessPlayerActionPacketSystemImpl\@\@YAXAEBV?$FlagComponent\@UPlayerComponentFlag\@\@\@\@AEBUServerPlayerCurrentMovementComponent\@\@AEBVUserEntityIdentifierComponent\@\@V?$Optional\@$$CBVReplayStateComponent\@\@\@\@AEAVActorOwnerComponent\@\@\@Z + */ + MCAPI void doProcessPlayerActionPacket(class FlagComponent const &, struct ServerPlayerCurrentMovementComponent const &, class UserEntityIdentifierComponent const &, class Optional, class ActorOwnerComponent &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ProjectileComponent.hpp b/LiteLoader/include/llapi/mc/ProjectileComponent.hpp index d6a713a491..e5950c60a7 100644 --- a/LiteLoader/include/llapi/mc/ProjectileComponent.hpp +++ b/LiteLoader/include/llapi/mc/ProjectileComponent.hpp @@ -29,6 +29,10 @@ enum class EAxis; #endif public: + /** + * @symbol ??0ProjectileComponent\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI ProjectileComponent(class ProjectileComponent const &); /** * @symbol ??0ProjectileComponent\@\@QEAA\@XZ */ @@ -37,10 +41,6 @@ enum class EAxis; * @symbol ??0ProjectileComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI ProjectileComponent(class ProjectileComponent &&); - /** - * @symbol ??0ProjectileComponent\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI ProjectileComponent(class ProjectileComponent const &); /** * @symbol ?addAdditionalSaveData\@ProjectileComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ProjectileItemComponent.hpp b/LiteLoader/include/llapi/mc/ProjectileItemComponent.hpp index df4c5a921d..775739d212 100644 --- a/LiteLoader/include/llapi/mc/ProjectileItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/ProjectileItemComponent.hpp @@ -51,16 +51,11 @@ class ProjectileItemComponent { virtual void __unk_vfn_3(); /** * @vftbl 4 - * @symbol __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 * @symbol ?buildNetworkTag\@?$NetworkedItemComponent\@VProjectileItemComponent\@\@\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 5 * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VProjectileItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/PropertiesSettings.hpp b/LiteLoader/include/llapi/mc/PropertiesSettings.hpp index ba4c8a3fbd..edb107857e 100644 --- a/LiteLoader/include/llapi/mc/PropertiesSettings.hpp +++ b/LiteLoader/include/llapi/mc/PropertiesSettings.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -86,6 +85,10 @@ class PropertiesSettings { * @symbol ?getCompressionThresholdBytesize\@PropertiesSettings\@\@QEBAGXZ */ MCAPI unsigned short getCompressionThresholdBytesize() const; + /** + * @symbol ?getContentLogLevel\@PropertiesSettings\@\@QEBA?AW4LogLevel\@\@XZ + */ + MCAPI enum class LogLevel getContentLogLevel() const; /** * @symbol ?getCustomProperty\@PropertiesSettings\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ @@ -94,10 +97,6 @@ class PropertiesSettings { * @symbol ?getDefaultPlayerPermissionLevel\@PropertiesSettings\@\@QEBA?BW4PlayerPermissionLevel\@\@XZ */ MCAPI enum class PlayerPermissionLevel const getDefaultPlayerPermissionLevel() const; - /** - * @symbol ?getDesiredHttpImplementation\@PropertiesSettings\@\@QEBA?AW4Implementation\@Http\@Bedrock\@\@XZ - */ - MCAPI enum class Bedrock::Http::Implementation getDesiredHttpImplementation() const; /** * @symbol ?getDifficulty\@PropertiesSettings\@\@QEBA?AW4Difficulty\@\@XZ */ @@ -202,6 +201,10 @@ class PropertiesSettings { * @symbol ?isClientSideGenEnabled\@PropertiesSettings\@\@QEBA_NXZ */ MCAPI bool isClientSideGenEnabled() const; + /** + * @symbol ?isContentLogConsoleOutputEnabled\@PropertiesSettings\@\@QEBA_NXZ + */ + MCAPI bool isContentLogConsoleOutputEnabled() const; /** * @symbol ?isContentLogFileEnabled\@PropertiesSettings\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/PropertyBag.hpp b/LiteLoader/include/llapi/mc/PropertyBag.hpp index 62239da2aa..cab7e516bf 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\@XZ - */ - MCAPI PropertyBag(); /** * @symbol ??0PropertyBag\@\@QEAA\@AEBVValue\@Json\@\@\@Z */ MCAPI PropertyBag(class Json::Value const &); + /** + * @symbol ??0PropertyBag\@\@QEAA\@XZ + */ + MCAPI PropertyBag(); /** * @symbol ?toJsonValue\@PropertyBag\@\@QEBAAEBVValue\@Json\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/Pufferfish.hpp b/LiteLoader/include/llapi/mc/Pufferfish.hpp index bc6162cca9..040edcfc9d 100644 --- a/LiteLoader/include/llapi/mc/Pufferfish.hpp +++ b/LiteLoader/include/llapi/mc/Pufferfish.hpp @@ -37,150 +37,145 @@ class Pufferfish : public Fish { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@Pufferfish\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 53 + * @vftbl 52 * @symbol ?startRiding\@Pufferfish\@\@UEAA_NAEAVActor\@\@\@Z */ virtual bool startRiding(class Actor &); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 - */ - virtual void __unk_vfn_243(); - /** - * @vftbl 258 + * @vftbl 250 * @symbol ?updateEntitySpecificMolangVariables\@Pufferfish\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@Pufferfish\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 274 + * @vftbl 266 * @symbol ?_onSizeUpdated\@Pufferfish\@\@UEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0Pufferfish\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PumpkinBlock.hpp b/LiteLoader/include/llapi/mc/PumpkinBlock.hpp index 6c5e6fd98b..7d9e2b3c27 100644 --- a/LiteLoader/include/llapi/mc/PumpkinBlock.hpp +++ b/LiteLoader/include/llapi/mc/PumpkinBlock.hpp @@ -45,16 +45,21 @@ class PumpkinBlock : public BlockLegacy { * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class PumpkinBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class PumpkinBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,140 +136,130 @@ class PumpkinBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 71 + * @vftbl 70 * @symbol ?dispense\@PumpkinBlock\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@PumpkinBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@PumpkinBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@PumpkinBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@PumpkinBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?getMappedFace\@PumpkinBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@PumpkinBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #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 e1ef46554f..a4dfee26f3 100644 --- a/LiteLoader/include/llapi/mc/PumpkinBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/PumpkinBlockItem.hpp @@ -36,11 +36,6 @@ class PumpkinBlockItem : public BlockItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class PumpkinBlockItem : public BlockItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -116,6 +116,16 @@ class PumpkinBlockItem : public BlockItem { * @symbol ?getEquipSound\@PumpkinBlockItem\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getEquipSound() const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); /** * @symbol ??0PumpkinBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/PurchaseReceiptPacket.hpp b/LiteLoader/include/llapi/mc/PurchaseReceiptPacket.hpp index c0abbd47a0..246bf8ee9d 100644 --- a/LiteLoader/include/llapi/mc/PurchaseReceiptPacket.hpp +++ b/LiteLoader/include/llapi/mc/PurchaseReceiptPacket.hpp @@ -51,9 +51,9 @@ class PurchaseReceiptPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PurchaseReceiptPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PurchaseReceiptPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0PurchaseReceiptPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/QuartzBlockBlock.hpp b/LiteLoader/include/llapi/mc/QuartzBlock.hpp similarity index 50% rename from LiteLoader/include/llapi/mc/QuartzBlockBlock.hpp rename to LiteLoader/include/llapi/mc/QuartzBlock.hpp index fec34a27e9..6de03bb33d 100644 --- a/LiteLoader/include/llapi/mc/QuartzBlockBlock.hpp +++ b/LiteLoader/include/llapi/mc/QuartzBlock.hpp @@ -1,5 +1,5 @@ /** - * @file QuartzBlockBlock.hpp + * @file QuartzBlock.hpp * */ #pragma once @@ -8,25 +8,20 @@ #include "BlockLegacy.hpp" #define BEFORE_EXTRA -// Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC class QuartzBlockBlock. - * - */ -class QuartzBlockBlock : public BlockLegacy { + +class QuartzBlock : public BlockLegacy { #define AFTER_EXTRA -// Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_QUARTZBLOCKBLOCK +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_QUARTZBLOCK public: - class QuartzBlockBlock& operator=(class QuartzBlockBlock const &) = delete; - QuartzBlockBlock(class QuartzBlockBlock const &) = delete; - QuartzBlockBlock() = delete; + class QuartzBlock& operator=(class QuartzBlock const &) = delete; + QuartzBlock(class QuartzBlock const &) = delete; + QuartzBlock() = delete; #endif public: @@ -40,16 +35,21 @@ class QuartzBlockBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +61,10 @@ class QuartzBlockBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +96,10 @@ class QuartzBlockBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,148 +126,143 @@ class QuartzBlockBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 102 + * @symbol ?asItemInstance\@QuartzBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ - virtual void __unk_vfn_82(); + virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@QuartzBlockBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + virtual void __unk_vfn_104(); /** * @vftbl 105 - * @symbol __unk_vfn_105 + * @symbol ?getPlacementBlock\@QuartzBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual void __unk_vfn_105(); + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@QuartzBlockBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 - * @symbol ?buildDescriptionId\@QuartzBlockBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @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 135 - * @symbol ?isAuxValueRelevantForPicking\@QuartzBlockBlock\@\@UEBA_NXZ + * @vftbl 133 + * @symbol ?isAuxValueRelevantForPicking\@QuartzBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 147 - * @symbol ?getVariant\@QuartzBlockBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 145 + * @symbol ?getVariant\@QuartzBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 150 - * @symbol ?getMappedFace\@QuartzBlockBlock\@\@UEBAEEAEBVBlock\@\@\@Z + * @vftbl 148 + * @symbol ?getMappedFace\@QuartzBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 - * @symbol ?getResourceItem\@QuartzBlockBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@QuartzBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 - * @symbol ?getSilkTouchItemInstance\@QuartzBlockBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@QuartzBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0QuartzBlockBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0QuartzBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ - MCAPI QuartzBlockBlock(std::string const &, int); + MCAPI QuartzBlock(std::string const &, int); }; diff --git a/LiteLoader/include/llapi/mc/Rabbit.hpp b/LiteLoader/include/llapi/mc/Rabbit.hpp index 0a2171956b..91c2db92a8 100644 --- a/LiteLoader/include/llapi/mc/Rabbit.hpp +++ b/LiteLoader/include/llapi/mc/Rabbit.hpp @@ -37,150 +37,145 @@ class Rabbit : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 - */ - virtual void __unk_vfn_178(); - /** - * @vftbl 187 + * @vftbl 185 * @symbol ?onSynchedDataUpdate\@Rabbit\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 258 + * @vftbl 250 * @symbol ?updateEntitySpecificMolangVariables\@Rabbit\@\@MEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@Rabbit\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@Rabbit\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 346 + * @vftbl 338 * @symbol ?newServerAiStep\@Rabbit\@\@UEAAXXZ */ virtual void newServerAiStep(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0Rabbit\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/RailBlock.hpp b/LiteLoader/include/llapi/mc/RailBlock.hpp index 4430e16689..91f9ce9ac4 100644 --- a/LiteLoader/include/llapi/mc/RailBlock.hpp +++ b/LiteLoader/include/llapi/mc/RailBlock.hpp @@ -40,16 +40,21 @@ class RailBlock : public BaseRailBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class RailBlock : public BaseRailBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class RailBlock : public BaseRailBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,110 +131,105 @@ class RailBlock : public BaseRailBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@RailBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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/RakNet.hpp b/LiteLoader/include/llapi/mc/RakNet.hpp index 84dd27aea7..abd9634210 100644 --- a/LiteLoader/include/llapi/mc/RakNet.hpp +++ b/LiteLoader/include/llapi/mc/RakNet.hpp @@ -29,6 +29,7 @@ namespace RakNet { class SimpleMutex; struct SocketDescriptor; struct SplitPacketChannel; + struct RakNetStatistics; struct SystemAddress { char filler[17 * 8]; // uncertain? diff --git a/LiteLoader/include/llapi/mc/RakNetConnector.hpp b/LiteLoader/include/llapi/mc/RakNetConnector.hpp index 359ce4197d..57fb565fa9 100644 --- a/LiteLoader/include/llapi/mc/RakNetConnector.hpp +++ b/LiteLoader/include/llapi/mc/RakNetConnector.hpp @@ -41,9 +41,9 @@ class RakNetConnector { */ MCVAPI void addConnectionStateListener(class Connector::ConnectionStateListener *); /** - * @symbol ?closeNetworkConnection\@RakNetConnector\@\@UEAAXAEAVNetworkConnection\@\@\@Z + * @symbol ?closeNetworkConnection\@RakNetConnector\@\@UEAAXAEBVNetworkIdentifier\@\@\@Z */ - MCVAPI void closeNetworkConnection(class NetworkConnection &); + MCVAPI void closeNetworkConnection(class NetworkIdentifier const &); /** * @symbol ?connect\@RakNetConnector\@\@UEAA_NAEBVGameConnectionInfo\@Social\@\@0\@Z */ @@ -76,6 +76,10 @@ class RakNetConnector { * @symbol ?getNatPunchInfo\@RakNetConnector\@\@UEBA?AUNatPunchInfo\@Connector\@\@XZ */ MCVAPI struct Connector::NatPunchInfo getNatPunchInfo() const; + /** + * @symbol ?getNetworkIdentifier\@RakNetConnector\@\@UEBA?AVNetworkIdentifier\@\@XZ + */ + MCVAPI class NetworkIdentifier getNetworkIdentifier() const; /** * @symbol ?getPeer\@RakNetConnector\@\@UEAAPEAVRakPeerInterface\@RakNet\@\@XZ */ @@ -92,14 +96,14 @@ class RakNetConnector { * @symbol ?getRefinedLocalIps\@RakNetConnector\@\@UEBA?AV?$vector\@USystemAddress\@RakNet\@\@V?$allocator\@USystemAddress\@RakNet\@\@\@std\@\@\@std\@\@XZ */ MCVAPI std::vector getRefinedLocalIps() const; - /** - * @symbol ?getTransportIdentifier\@RakNetConnector\@\@UEBA_KXZ - */ - MCVAPI unsigned __int64 getTransportIdentifier() const; /** * @symbol ?host\@RakNetConnector\@\@UEAA_NAEBUConnectionDefinition\@\@\@Z */ MCVAPI bool host(struct ConnectionDefinition const &); + /** + * @symbol ?isConnected\@RakNetConnector\@\@UEBA_NAEBVNetworkIdentifier\@\@\@Z + */ + MCVAPI bool isConnected(class NetworkIdentifier const &) const; /** * @symbol ?isIPv4Supported\@RakNetConnector\@\@UEBA_NXZ */ @@ -141,6 +145,10 @@ class RakNetConnector { * @symbol ??0RakNetConnector\@\@QEAA\@AEAUConnectionCallbacks\@0\@AEAVIPSupportInterface\@RakPeerHelper\@\@AEBV?$NonOwnerPointer\@VAppPlatform\@\@\@Bedrock\@\@\@Z */ MCAPI RakNetConnector(struct RakNetConnector::ConnectionCallbacks &, class RakPeerHelper::IPSupportInterface &, class Bedrock::NonOwnerPointer const &); + /** + * @symbol ?getStatistics\@RakNetConnector\@\@QEAA_NAEAURakNetStatistics\@RakNet\@\@\@Z + */ + MCAPI bool getStatistics(struct RakNet::RakNetStatistics &); //private: /** diff --git a/LiteLoader/include/llapi/mc/RakNetServerLocator.hpp b/LiteLoader/include/llapi/mc/RakNetServerLocator.hpp index a2e209dd68..2f9ab4ab56 100644 --- a/LiteLoader/include/llapi/mc/RakNetServerLocator.hpp +++ b/LiteLoader/include/llapi/mc/RakNetServerLocator.hpp @@ -5,8 +5,8 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "RakPeerHelper.hpp" #include "Bedrock.hpp" +#include "RakPeerHelper.hpp" #include "RakNet.hpp" #define BEFORE_EXTRA @@ -55,14 +55,14 @@ struct AnnounceServerData { virtual void _onEnable(); /** * @vftbl 3 - * @symbol ?startAnnouncingServer\@RakNetServerLocator\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0W4GameType\@\@HH_N2W4TransportLayer\@\@\@Z + * @symbol ?startAnnouncingServer\@RakNetServerLocator\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0V?$NonOwnerPointer\@VAppPlatform\@\@\@Bedrock\@\@W4GameType\@\@HH_N3\@Z */ - virtual void startAnnouncingServer(std::string const &, std::string const &, enum class GameType, int, int, bool, bool, enum class TransportLayer); + virtual void startAnnouncingServer(std::string const &, std::string const &, class Bedrock::NonOwnerPointer, enum class GameType, int, int, bool, bool); /** * @vftbl 4 - * @symbol ?stopAnnouncingServer\@RakNetServerLocator\@\@UEAAXXZ + * @symbol ?stopAnnouncingServer\@RakNetServerLocator\@\@UEAAXV?$NonOwnerPointer\@VAppPlatform\@\@\@Bedrock\@\@\@Z */ - virtual void stopAnnouncingServer(); + virtual void stopAnnouncingServer(class Bedrock::NonOwnerPointer); /** * @vftbl 5 * @symbol ?startServerDiscovery\@RakNetServerLocator\@\@UEAAXUPortPair\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/RandomSearchAndDigGoal.hpp b/LiteLoader/include/llapi/mc/RandomSearchAndDigGoal.hpp index 6d1211661a..1d279ef0df 100644 --- a/LiteLoader/include/llapi/mc/RandomSearchAndDigGoal.hpp +++ b/LiteLoader/include/llapi/mc/RandomSearchAndDigGoal.hpp @@ -74,6 +74,10 @@ class RandomSearchAndDigGoal { MCAPI enum class RandomSearchAndDigGoal::CanUseOutcome _canUse(); //private: + /** + * @symbol ?_emitDiggingParticles\@RandomSearchAndDigGoal\@\@AEAAXXZ + */ + MCAPI void _emitDiggingParticles(); /** * @symbol ?_triggerEvent\@RandomSearchAndDigGoal\@\@AEBAXAEBVActorDefinitionTrigger\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/RandomSearchAndDigItemChoiceEntry.hpp b/LiteLoader/include/llapi/mc/RandomSearchAndDigItemChoiceEntry.hpp new file mode 100644 index 0000000000..2a50fea887 --- /dev/null +++ b/LiteLoader/include/llapi/mc/RandomSearchAndDigItemChoiceEntry.hpp @@ -0,0 +1,32 @@ +/** + * @file RandomSearchAndDigItemChoiceEntry.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct RandomSearchAndDigItemChoiceEntry { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_RANDOMSEARCHANDDIGITEMCHOICEENTRY +public: + struct RandomSearchAndDigItemChoiceEntry& operator=(struct RandomSearchAndDigItemChoiceEntry const &) = delete; + RandomSearchAndDigItemChoiceEntry(struct RandomSearchAndDigItemChoiceEntry const &) = delete; + RandomSearchAndDigItemChoiceEntry() = delete; +#endif + +public: + /** + * @symbol ??1RandomSearchAndDigItemChoiceEntry\@\@QEAA\@XZ + */ + MCAPI ~RandomSearchAndDigItemChoiceEntry(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/RandomizableBlockActorContainerBase.hpp b/LiteLoader/include/llapi/mc/RandomizableBlockActorContainerBase.hpp index d0b009b237..53ae9cb271 100644 --- a/LiteLoader/include/llapi/mc/RandomizableBlockActorContainerBase.hpp +++ b/LiteLoader/include/llapi/mc/RandomizableBlockActorContainerBase.hpp @@ -81,10 +81,10 @@ class RandomizableBlockActorContainerBase : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); #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 43c63ff444..8c7ff3111d 100644 --- a/LiteLoader/include/llapi/mc/RangedWeaponItem.hpp +++ b/LiteLoader/include/llapi/mc/RangedWeaponItem.hpp @@ -36,11 +36,6 @@ class RangedWeaponItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class RangedWeaponItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -127,7 +127,17 @@ class RangedWeaponItem : public Item { */ virtual bool mineBlock(class ItemStack &, class Block const &, int, int, int, class Actor *) const; /** - * @vftbl 120 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 122 * @symbol ?getAnimationFrameFor\@RangedWeaponItem\@\@UEBAHPEAVMob\@\@_NPEBVItemStack\@\@_N\@Z */ virtual int getAnimationFrameFor(class Mob *, bool, class ItemStack const *, bool) const; diff --git a/LiteLoader/include/llapi/mc/RapidFertilizerItem.hpp b/LiteLoader/include/llapi/mc/RapidFertilizerItem.hpp index f8afc3740f..df4ec85292 100644 --- a/LiteLoader/include/llapi/mc/RapidFertilizerItem.hpp +++ b/LiteLoader/include/llapi/mc/RapidFertilizerItem.hpp @@ -36,11 +36,6 @@ class RapidFertilizerItem : public FertilizerItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class RapidFertilizerItem : public FertilizerItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -106,5 +106,15 @@ class RapidFertilizerItem : public FertilizerItem { * @symbol ?fixupCommon\@RapidFertilizerItem\@\@UEBAXAEAVItemStackBase\@\@\@Z */ virtual void fixupCommon(class ItemStackBase &) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); }; diff --git a/LiteLoader/include/llapi/mc/Recipe.hpp b/LiteLoader/include/llapi/mc/Recipe.hpp index 0e193fa4a3..b7af3a5775 100644 --- a/LiteLoader/include/llapi/mc/Recipe.hpp +++ b/LiteLoader/include/llapi/mc/Recipe.hpp @@ -36,9 +36,9 @@ class Recipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@ShapelessRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z + * @symbol ?assemble\@ShapelessRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEAVCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const = 0; + virtual std::vector const & assemble(class CraftingContainer &, class CraftingContext &) const = 0; /** * @vftbl 2 * @symbol ?getCraftingSize\@BannerAddPatternRecipe\@\@UEBAHXZ @@ -61,9 +61,9 @@ class Recipe { virtual void __unk_vfn_5() = 0; /** * @vftbl 6 - * @symbol ?matches\@ShapedChemistryRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @symbol ?matches\@ShapedChemistryRecipe\@\@UEBA_NAEBVCraftingContainer\@\@AEBVCraftingContext\@\@\@Z */ - virtual bool matches(class CraftingContainer &, class Level &) const = 0; + virtual bool matches(class CraftingContainer const &, class CraftingContext const &) const = 0; /** * @vftbl 7 * @symbol ?size\@BannerAddPatternRecipe\@\@UEBAHXZ diff --git a/LiteLoader/include/llapi/mc/RecipeIngredient.hpp b/LiteLoader/include/llapi/mc/RecipeIngredient.hpp index de6e8a8164..05d147ac00 100644 --- a/LiteLoader/include/llapi/mc/RecipeIngredient.hpp +++ b/LiteLoader/include/llapi/mc/RecipeIngredient.hpp @@ -50,29 +50,29 @@ class RecipeIngredient : public ItemDescriptorCount { */ MCAPI RecipeIngredient(class ItemDescriptor const &, unsigned short); /** - * @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\@AEBV0\@\@Z */ MCAPI RecipeIngredient(class RecipeIngredient const &); - /** - * @symbol ??0RecipeIngredient\@\@QEAA\@AEBVBlockLegacy\@\@G\@Z - */ - MCAPI RecipeIngredient(class BlockLegacy const &, unsigned short); /** * @symbol ??0RecipeIngredient\@\@QEAA\@AEBUItemTag\@\@G\@Z */ MCAPI RecipeIngredient(struct ItemTag const &, unsigned short); + /** + * @symbol ??0RecipeIngredient\@\@QEAA\@AEBVItem\@\@HG\@Z + */ + MCAPI RecipeIngredient(class Item const &, int, unsigned short); /** * @symbol ??0RecipeIngredient\@\@QEAA\@AEAVReadOnlyBinaryStream\@\@\@Z */ MCAPI RecipeIngredient(class ReadOnlyBinaryStream &); /** - * @symbol ??0RecipeIngredient\@\@QEAA\@AEBVItem\@\@HG\@Z + * @symbol ??0RecipeIngredient\@\@QEAA\@AEBVBlock\@\@G\@Z */ - MCAPI RecipeIngredient(class Item const &, int, unsigned short); + MCAPI RecipeIngredient(class Block 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 d5c0668f10..6597a13a50 100644 --- a/LiteLoader/include/llapi/mc/RecipeUnlockingRequirement.hpp +++ b/LiteLoader/include/llapi/mc/RecipeUnlockingRequirement.hpp @@ -36,17 +36,17 @@ class RecipeUnlockingRequirement { public: /** - * @symbol ??0RecipeUnlockingRequirement\@\@QEAA\@V?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0RecipeUnlockingRequirement\@\@QEAA\@W4UnlockingContext\@0\@\@Z */ - MCAPI RecipeUnlockingRequirement(std::vector); + MCAPI RecipeUnlockingRequirement(enum class RecipeUnlockingRequirement::UnlockingContext); /** * @symbol ??0RecipeUnlockingRequirement\@\@QEAA\@XZ */ MCAPI RecipeUnlockingRequirement(); /** - * @symbol ??0RecipeUnlockingRequirement\@\@QEAA\@W4UnlockingContext\@0\@\@Z + * @symbol ??0RecipeUnlockingRequirement\@\@QEAA\@V?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@std\@\@\@Z */ - MCAPI RecipeUnlockingRequirement(enum class RecipeUnlockingRequirement::UnlockingContext); + MCAPI RecipeUnlockingRequirement(std::vector); /** * @symbol ?canBeUnlockedByContext\@RecipeUnlockingRequirement\@\@QEBA_NW4UnlockingContext\@1\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/RecipeUnlockingSystem.hpp b/LiteLoader/include/llapi/mc/RecipeUnlockingSystem.hpp index b4cab7d5be..dcf41c4b1c 100644 --- a/LiteLoader/include/llapi/mc/RecipeUnlockingSystem.hpp +++ b/LiteLoader/include/llapi/mc/RecipeUnlockingSystem.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "RecipeUnlockingRequirement.hpp" #define BEFORE_EXTRA @@ -29,4 +30,40 @@ class RecipeUnlockingSystem { */ MCAPI static struct TickingSystemWithInfo createSystem(); +//protected: + /** + * @symbol ?_hasRecipesLeftToUnlock\@RecipeUnlockingSystem\@\@KA_NAEBVRecipes\@\@AEBVUnlockedRecipesServerComponent\@\@\@Z + */ + MCAPI static bool _hasRecipesLeftToUnlock(class Recipes const &, class UnlockedRecipesServerComponent const &); + /** + * @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 + */ + MCAPI static std::vector _unlockRecipes(class UnlockedRecipesServerComponent &, class Recipes const &, bool, class std::optional const &); + /** + * @symbol ?_useContext\@RecipeUnlockingSystem\@\@KAXAEAVUnlockedRecipesServerComponent\@\@AEBVRecipes\@\@W4UnlockingContext\@RecipeUnlockingRequirement\@\@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\@\@\@Z + */ + MCAPI static void _useContext(class UnlockedRecipesServerComponent &, class Recipes const &, enum class RecipeUnlockingRequirement::UnlockingContext, std::vector &); + +//private: + /** + * @symbol ?_handleCriterionUnlocks\@RecipeUnlockingSystem\@\@CAXPEAVServerPlayer\@\@AEAVUnlockedRecipesServerComponent\@\@\@Z + */ + MCAPI static void _handleCriterionUnlocks(class ServerPlayer *, class UnlockedRecipesServerComponent &); + /** + * @symbol ?_handleInitialUnlocks\@RecipeUnlockingSystem\@\@CAXPEAVServerPlayer\@\@AEAVUnlockedRecipesServerComponent\@\@\@Z + */ + MCAPI static void _handleInitialUnlocks(class ServerPlayer *, class UnlockedRecipesServerComponent &); + /** + * @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: + +private: + }; diff --git a/LiteLoader/include/llapi/mc/Recipes.hpp b/LiteLoader/include/llapi/mc/Recipes.hpp index 6a54f87064..37deb1729f 100644 --- a/LiteLoader/include/llapi/mc/Recipes.hpp +++ b/LiteLoader/include/llapi/mc/Recipes.hpp @@ -82,6 +82,10 @@ struct NormalizedRectangularRecipeResults { * @symbol ?addFurnaceRecipeAuxData\@Recipes\@\@QEAAXAEBVItemInstance\@\@0AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@std\@\@\@Z */ 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 + */ + 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); /** * @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 */ @@ -90,26 +94,22 @@ struct NormalizedRectangularRecipeResults { * @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 */ 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); - /** - * @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 - */ - 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); - /** - * @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 - */ - 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); /** * @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 */ 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); + /** + * @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 + */ + 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); /** * @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 */ 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); /** - * @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\@\@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\@\@Z */ - MCAPI void addShulkerBoxRecipe(std::string &, class ItemInstance const &, std::vector const &, std::vector const &); + MCAPI void addShulkerBoxRecipe(std::string &, class ItemInstance const &, std::vector const &, std::vector const &, class std::optional); /** * @symbol ?clearRecipes\@Recipes\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/RecordItem.hpp b/LiteLoader/include/llapi/mc/RecordItem.hpp index d7216f87e3..30b0050716 100644 --- a/LiteLoader/include/llapi/mc/RecordItem.hpp +++ b/LiteLoader/include/llapi/mc/RecordItem.hpp @@ -38,9 +38,9 @@ class RecordItem : public Item { virtual void __unk_vfn_0(); /** * @vftbl 7 - * @symbol __unk_vfn_7 + * @symbol ?isMusicDisk\@RecordItem\@\@UEBA_NXZ */ - virtual void __unk_vfn_7(); + virtual bool isMusicDisk() const; /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +56,11 @@ class RecordItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -111,12 +116,16 @@ class RecordItem : public Item { * @symbol ?buildDescriptionId\@RecordItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_RECORDITEM /** - * @symbol ?isMusicDisk\@RecordItem\@\@UEBA_NXZ + * @vftbl 115 + * @symbol __unk_vfn_115 */ - MCVAPI bool isMusicDisk() const; -#endif + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); /** * @symbol ??0RecordItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4LevelSoundEvent\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/RecordItemComponent.hpp b/LiteLoader/include/llapi/mc/RecordItemComponent.hpp index 90daa2907b..837ac29340 100644 --- a/LiteLoader/include/llapi/mc/RecordItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/RecordItemComponent.hpp @@ -51,23 +51,18 @@ class RecordItemComponent { virtual void __unk_vfn_3(); /** * @vftbl 4 - * @symbol __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 * @symbol ?buildNetworkTag\@?$NetworkedItemComponent\@VRecordItemComponent\@\@\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 5 * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VRecordItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?getAlias\@RecordItemComponent\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?appendFormattedHovertext\@RecordItemComponent\@\@QEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI std::string getAlias() const; + MCAPI void appendFormattedHovertext(std::string &) const; /** * @symbol ?getComparatorSignal\@RecordItemComponent\@\@QEBAHXZ */ @@ -76,6 +71,10 @@ class RecordItemComponent { * @symbol ?getDuration\@RecordItemComponent\@\@QEBAMXZ */ MCAPI float getDuration() const; + /** + * @symbol ?getRecordDescription\@RecordItemComponent\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + */ + MCAPI std::string getRecordDescription() const; /** * @symbol ?getSound\@RecordItemComponent\@\@QEBA?AW4LevelSoundEvent\@\@XZ */ @@ -88,5 +87,9 @@ class RecordItemComponent { * @symbol ?getIdentifier\@RecordItemComponent\@\@SAAEBVHashedString\@\@XZ */ MCAPI static class HashedString const & getIdentifier(); + /** + * @symbol ?getRecordNameNoPrefix\@RecordItemComponent\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4LevelSoundEvent\@\@\@Z + */ + MCAPI static std::string getRecordNameNoPrefix(enum class LevelSoundEvent); }; diff --git a/LiteLoader/include/llapi/mc/RecoveryCompassItem.hpp b/LiteLoader/include/llapi/mc/RecoveryCompassItem.hpp index 6e0f06b341..f4604e1849 100644 --- a/LiteLoader/include/llapi/mc/RecoveryCompassItem.hpp +++ b/LiteLoader/include/llapi/mc/RecoveryCompassItem.hpp @@ -34,11 +34,6 @@ class RecoveryCompassItem : public AbstractCompassItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -54,6 +49,11 @@ class RecoveryCompassItem : public AbstractCompassItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -99,6 +99,16 @@ class RecoveryCompassItem : public AbstractCompassItem { * @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 ??0RecoveryCompassItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/RedStoneDustItem.hpp b/LiteLoader/include/llapi/mc/RedStoneDustItem.hpp index 99fce259ef..057a1a22c3 100644 --- a/LiteLoader/include/llapi/mc/RedStoneDustItem.hpp +++ b/LiteLoader/include/llapi/mc/RedStoneDustItem.hpp @@ -36,11 +36,6 @@ class RedStoneDustItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class RedStoneDustItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -102,12 +102,22 @@ class RedStoneDustItem : public Item { */ virtual void __unk_vfn_80(); /** - * @vftbl 131 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 133 * @symbol ?_calculatePlacePos\@RedStoneDustItem\@\@EEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 132 + * @vftbl 134 * @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 eb8c188fa1..313a7f1fd3 100644 --- a/LiteLoader/include/llapi/mc/RedStoneOreBlock.hpp +++ b/LiteLoader/include/llapi/mc/RedStoneOreBlock.hpp @@ -40,16 +40,21 @@ class RedStoneOreBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class RedStoneOreBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class RedStoneOreBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,157 +131,152 @@ class RedStoneOreBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 52 + * @vftbl 51 * @symbol ?canBeOriginalSurface\@RedStoneOreBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_53(); + /** + * @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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@RedStoneOreBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 109 + * @vftbl 108 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@RedStoneOreBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 165 + * @vftbl 163 * @symbol ?onStandOn\@RedStoneOreBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ virtual void onStandOn(class EntityContext &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 173 + * @vftbl 171 * @symbol ?randomTick\@RedStoneOreBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@RedStoneOreBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@RedStoneOreBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@RedStoneOreBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@RedStoneOreBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 195 + * @vftbl 194 * @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 e102d22933..01b50ab2c6 100644 --- a/LiteLoader/include/llapi/mc/RedStoneWireBlock.hpp +++ b/LiteLoader/include/llapi/mc/RedStoneWireBlock.hpp @@ -45,16 +45,21 @@ class RedStoneWireBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class RedStoneWireBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class RedStoneWireBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,15 +136,15 @@ class RedStoneWireBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -147,166 +152,161 @@ class RedStoneWireBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@RedStoneWireBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 64 + * @vftbl 63 * @symbol ?shouldConnectToRedstone\@RedStoneWireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 73 + * @vftbl 72 * @symbol ?onRedstoneUpdate\@RedStoneWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@RedStoneWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@RedStoneWireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@RedStoneWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@RedStoneWireBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 136 + * @vftbl 134 * @symbol ?getColor\@RedStoneWireBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 137 + * @vftbl 135 * @symbol ?getColor\@RedStoneWireBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 148 + * @vftbl 146 * @symbol ?canSpawnOn\@RedStoneWireBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@RedStoneWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@RedStoneWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@RedStoneWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@RedStoneWireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@RedStoneWireBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @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 7f36ae984d..b5cd60f8eb 100644 --- a/LiteLoader/include/llapi/mc/RedstoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/RedstoneBlock.hpp @@ -40,16 +40,21 @@ class RedstoneBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class RedstoneBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class RedstoneBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,130 +131,125 @@ class RedstoneBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 51 + * @vftbl 50 * @symbol ?isSignalSource\@RedstoneBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 64 + * @vftbl 63 * @symbol ?shouldConnectToRedstone\@RedstoneBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@RedstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 148 + * @vftbl 146 * @symbol ?canSpawnOn\@RedstoneBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@RedstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 1aa51f87a4..af31e37bda 100644 --- a/LiteLoader/include/llapi/mc/RedstoneLampBlock.hpp +++ b/LiteLoader/include/llapi/mc/RedstoneLampBlock.hpp @@ -40,16 +40,21 @@ class RedstoneLampBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class RedstoneLampBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class RedstoneLampBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,90 +131,95 @@ class RedstoneLampBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 64 + * @vftbl 63 * @symbol ?shouldConnectToRedstone\@RedstoneLampBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 73 + * @vftbl 72 * @symbol ?onRedstoneUpdate\@RedstoneLampBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@RedstoneLampBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@RedstoneLampBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -217,51 +227,41 @@ class RedstoneLampBlock : public BlockLegacy { 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 ?onPlace\@RedstoneLampBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@RedstoneLampBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@RedstoneLampBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @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 e7a768be07..7b3912fae9 100644 --- a/LiteLoader/include/llapi/mc/RedstoneTorchBlock.hpp +++ b/LiteLoader/include/llapi/mc/RedstoneTorchBlock.hpp @@ -40,16 +40,21 @@ class RedstoneTorchBlock : public TorchBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class RedstoneTorchBlock : public TorchBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class RedstoneTorchBlock : public TorchBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,167 +131,162 @@ class RedstoneTorchBlock : public TorchBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 51 + * @vftbl 50 * @symbol ?isSignalSource\@RedstoneTorchBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 64 + * @vftbl 63 * @symbol ?shouldConnectToRedstone\@RedstoneTorchBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 73 + * @vftbl 72 * @symbol ?onRedstoneUpdate\@RedstoneTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@RedstoneTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@RedstoneTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@RedstoneTorchBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 148 + * @vftbl 146 * @symbol ?canSpawnOn\@RedstoneTorchBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@RedstoneTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 162 + * @vftbl 160 * @symbol ?_addHardCodedBlockComponents\@RedstoneTorchBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@RedstoneTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@RedstoneTorchBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@RedstoneTorchBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 195 + * @vftbl 194 * @symbol ?getTickDelay\@RedstoneTorchBlock\@\@UEAAHXZ */ virtual int getTickDelay(); diff --git a/LiteLoader/include/llapi/mc/RefreshAABBSystem.hpp b/LiteLoader/include/llapi/mc/RefreshAABBSystem.hpp deleted file mode 100644 index ead4dd4e74..0000000000 --- a/LiteLoader/include/llapi/mc/RefreshAABBSystem.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file RefreshAABBSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class RefreshAABBSystem. - * - */ -class RefreshAABBSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_REFRESHAABBSYSTEM -public: - class RefreshAABBSystem& operator=(class RefreshAABBSystem const &) = delete; - RefreshAABBSystem(class RefreshAABBSystem const &) = delete; - RefreshAABBSystem() = delete; -#endif - -public: - /** - * @symbol ?createRefreshAABBSystem\@RefreshAABBSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createRefreshAABBSystem(); - /** - * @symbol ?refreshAABB\@RefreshAABBSystem\@\@SA?AVAABB\@\@MAEBVVec3\@\@AEBVVec2\@\@1\@Z - */ - MCAPI static class AABB refreshAABB(float, class Vec3 const &, class Vec2 const &, class Vec2 const &); - -}; diff --git a/LiteLoader/include/llapi/mc/ReinforcedDeepslateBlock.hpp b/LiteLoader/include/llapi/mc/ReinforcedDeepslateBlock.hpp index d740fcccad..999db431cc 100644 --- a/LiteLoader/include/llapi/mc/ReinforcedDeepslateBlock.hpp +++ b/LiteLoader/include/llapi/mc/ReinforcedDeepslateBlock.hpp @@ -38,16 +38,21 @@ class ReinforcedDeepslateBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -59,10 +64,10 @@ class ReinforcedDeepslateBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -94,10 +99,10 @@ class ReinforcedDeepslateBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -124,110 +129,105 @@ class ReinforcedDeepslateBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 52 + * @vftbl 51 * @symbol ?canBeOriginalSurface\@ReinforcedDeepslateBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_REINFORCEDDEEPSLATEBLOCK /** * @symbol ?canBeSilkTouched\@ReinforcedDeepslateBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/RemoteConnectorComposite.hpp b/LiteLoader/include/llapi/mc/RemoteConnectorComposite.hpp deleted file mode 100644 index d5015ab615..0000000000 --- a/LiteLoader/include/llapi/mc/RemoteConnectorComposite.hpp +++ /dev/null @@ -1,78 +0,0 @@ -/** - * @file RemoteConnectorComposite.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "Bedrock.hpp" -#include "RakNetConnector.hpp" -#include "RakPeerHelper.hpp" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -class RemoteConnectorComposite { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_REMOTECONNECTORCOMPOSITE -public: - class RemoteConnectorComposite& operator=(class RemoteConnectorComposite const &) = delete; - RemoteConnectorComposite(class RemoteConnectorComposite const &) = delete; -#endif - -public: - /** - * @symbol ??0RemoteConnectorComposite\@\@QEAA\@XZ - */ - MCAPI RemoteConnectorComposite(); - /** - * @symbol ?disable\@RemoteConnectorComposite\@\@QEAAXXZ - */ - MCAPI void disable(); - /** - * @symbol ?getActiveConnector\@RemoteConnectorComposite\@\@QEBA?AV?$NonOwnerPointer\@VRemoteConnector\@\@\@Bedrock\@\@XZ - */ - MCAPI class Bedrock::NonOwnerPointer getActiveConnector() const; - /** - * @symbol ?getNetherNetConnector\@RemoteConnectorComposite\@\@QEBA?AV?$NonOwnerPointer\@UNetherNetConnector\@\@\@Bedrock\@\@XZ - */ - MCAPI class Bedrock::NonOwnerPointer getNetherNetConnector() const; - /** - * @symbol ?getRakNetConnector\@RemoteConnectorComposite\@\@QEBA?AV?$NonOwnerPointer\@VRakNetConnector\@\@\@Bedrock\@\@XZ - */ - MCAPI class Bedrock::NonOwnerPointer getRakNetConnector() const; - /** - * @symbol ?hasNetherNetConnector\@RemoteConnectorComposite\@\@QEBA_NXZ - */ - MCAPI bool hasNetherNetConnector() const; - /** - * @symbol ?initializeRakNetConnector\@RemoteConnectorComposite\@\@QEAAXAEAUConnectionCallbacks\@RakNetConnector\@\@AEAVIPSupportInterface\@RakPeerHelper\@\@AEBV?$NonOwnerPointer\@VAppPlatform\@\@\@Bedrock\@\@\@Z - */ - MCAPI void initializeRakNetConnector(struct RakNetConnector::ConnectionCallbacks &, class RakPeerHelper::IPSupportInterface &, class Bedrock::NonOwnerPointer const &); - /** - * @symbol ?isActiveConnectorSet\@RemoteConnectorComposite\@\@QEBA_NXZ - */ - MCAPI bool isActiveConnectorSet() const; - /** - * @symbol ?setActiveTransportLayer\@RemoteConnectorComposite\@\@QEAAXW4TransportLayer\@\@\@Z - */ - MCAPI void setActiveTransportLayer(enum class TransportLayer); - /** - * @symbol ?tryEnable\@RemoteConnectorComposite\@\@QEAAXXZ - */ - MCAPI void tryEnable(); - /** - * @symbol ?update\@RemoteConnectorComposite\@\@QEAAXXZ - */ - MCAPI void update(); - /** - * @symbol ??1RemoteConnectorComposite\@\@QEAA\@XZ - */ - MCAPI ~RemoteConnectorComposite(); - -}; diff --git a/LiteLoader/include/llapi/mc/RemoveActorPacket.hpp b/LiteLoader/include/llapi/mc/RemoveActorPacket.hpp index b3e3cc315b..939722d65a 100644 --- a/LiteLoader/include/llapi/mc/RemoveActorPacket.hpp +++ b/LiteLoader/include/llapi/mc/RemoveActorPacket.hpp @@ -51,9 +51,9 @@ class RemoveActorPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@RemoveActorPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@RemoveActorPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_REMOVEACTORPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/RemoveObjectivePacket.hpp b/LiteLoader/include/llapi/mc/RemoveObjectivePacket.hpp index 06e06fa297..c504c35626 100644 --- a/LiteLoader/include/llapi/mc/RemoveObjectivePacket.hpp +++ b/LiteLoader/include/llapi/mc/RemoveObjectivePacket.hpp @@ -51,9 +51,9 @@ class RemoveObjectivePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@RemoveObjectivePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@RemoveObjectivePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_REMOVEOBJECTIVEPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/RemoveVolumeEntityPacket.hpp b/LiteLoader/include/llapi/mc/RemoveVolumeEntityPacket.hpp index dd0586cff9..cd250b0c0a 100644 --- a/LiteLoader/include/llapi/mc/RemoveVolumeEntityPacket.hpp +++ b/LiteLoader/include/llapi/mc/RemoveVolumeEntityPacket.hpp @@ -52,9 +52,9 @@ class RemoveVolumeEntityPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@RemoveVolumeEntityPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@RemoveVolumeEntityPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_REMOVEVOLUMEENTITYPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/RemovedVanillaBlockTypeIds.hpp b/LiteLoader/include/llapi/mc/RemovedVanillaBlockTypeIds.hpp new file mode 100644 index 0000000000..3d34b124e0 --- /dev/null +++ b/LiteLoader/include/llapi/mc/RemovedVanillaBlockTypeIds.hpp @@ -0,0 +1,24 @@ +/** + * @file RemovedVanillaBlockTypeIds.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace RemovedVanillaBlockTypeIds { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?LavaCauldron\@RemovedVanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const LavaCauldron; + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/RenderOffsetsItemComponent.hpp b/LiteLoader/include/llapi/mc/RenderOffsetsItemComponent.hpp index 4b318c6a93..6a38bfaf45 100644 --- a/LiteLoader/include/llapi/mc/RenderOffsetsItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/RenderOffsetsItemComponent.hpp @@ -62,16 +62,11 @@ struct ItemTransforms { virtual void __unk_vfn_3(); /** * @vftbl 4 - * @symbol __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 * @symbol ?buildNetworkTag\@?$NetworkedItemComponent\@VRenderOffsetsItemComponent\@\@\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 5 * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VRenderOffsetsItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/RenderParams.hpp b/LiteLoader/include/llapi/mc/RenderParams.hpp index 761bb2b953..c175cd4b7e 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\@AEBV0\@\@Z - */ - MCAPI RenderParams(class RenderParams const &); /** * @symbol ??0RenderParams\@\@QEAA\@XZ */ MCAPI RenderParams(); + /** + * @symbol ??0RenderParams\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI RenderParams(class RenderParams const &); /** * @symbol ??0RenderParams\@\@QEAA\@$$QEAV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/RepairItemEntry.hpp b/LiteLoader/include/llapi/mc/RepairItemEntry.hpp index 9263779e93..cea58f937e 100644 --- a/LiteLoader/include/llapi/mc/RepairItemEntry.hpp +++ b/LiteLoader/include/llapi/mc/RepairItemEntry.hpp @@ -21,15 +21,13 @@ struct RepairItemEntry { // Add Member There #undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_REPAIRITEMENTRY +public: + RepairItemEntry(struct RepairItemEntry const &) = delete; + RepairItemEntry() = delete; +#endif + public: - /** - * @symbol ??0RepairItemEntry\@\@QEAA\@AEBU0\@\@Z - */ - MCAPI RepairItemEntry(struct RepairItemEntry const &); - /** - * @symbol ??0RepairItemEntry\@\@QEAA\@XZ - */ - MCAPI RepairItemEntry(); /** * @symbol ??4RepairItemEntry\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/RepairItemRecipe.hpp b/LiteLoader/include/llapi/mc/RepairItemRecipe.hpp index df2a0478b9..65db2b8c04 100644 --- a/LiteLoader/include/llapi/mc/RepairItemRecipe.hpp +++ b/LiteLoader/include/llapi/mc/RepairItemRecipe.hpp @@ -37,9 +37,9 @@ class RepairItemRecipe : public Recipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@RepairItemRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z + * @symbol ?assemble\@RepairItemRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEAVCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; + virtual std::vector const & assemble(class CraftingContainer &, class CraftingContext &) const; /** * @vftbl 2 * @symbol ?getCraftingSize\@RepairItemRecipe\@\@UEBAHXZ @@ -62,9 +62,9 @@ class RepairItemRecipe : public Recipe { virtual void __unk_vfn_5(); /** * @vftbl 6 - * @symbol ?matches\@RepairItemRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @symbol ?matches\@RepairItemRecipe\@\@UEBA_NAEBVCraftingContainer\@\@AEBVCraftingContext\@\@\@Z */ - virtual bool matches(class CraftingContainer &, class Level &) const; + virtual bool matches(class CraftingContainer const &, class CraftingContext const &) const; /** * @vftbl 7 * @symbol ?size\@RepairItemRecipe\@\@UEBAHXZ diff --git a/LiteLoader/include/llapi/mc/RepairItemResult.hpp b/LiteLoader/include/llapi/mc/RepairItemResult.hpp new file mode 100644 index 0000000000..97f5d09e04 --- /dev/null +++ b/LiteLoader/include/llapi/mc/RepairItemResult.hpp @@ -0,0 +1,32 @@ +/** + * @file RepairItemResult.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct RepairItemResult { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_REPAIRITEMRESULT +public: + struct RepairItemResult& operator=(struct RepairItemResult const &) = delete; + RepairItemResult(struct RepairItemResult const &) = delete; + RepairItemResult() = delete; +#endif + +public: + /** + * @symbol ??1RepairItemResult\@\@QEAA\@XZ + */ + MCAPI ~RepairItemResult(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/RepairableItemComponent.hpp b/LiteLoader/include/llapi/mc/RepairableItemComponent.hpp index b613e4234a..959798d190 100644 --- a/LiteLoader/include/llapi/mc/RepairableItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/RepairableItemComponent.hpp @@ -51,23 +51,18 @@ class RepairableItemComponent { virtual void __unk_vfn_3(); /** * @vftbl 4 - * @symbol __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 * @symbol ?buildNetworkTag\@?$NetworkedItemComponent\@VRepairableItemComponent\@\@\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 5 * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VRepairableItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?handleItemRepair\@RepairableItemComponent\@\@QEAAHAEAVItemStackBase\@\@0\@Z + * @symbol ?handleItemRepair\@RepairableItemComponent\@\@QEAA?AURepairItemResult\@\@AEAVItemStack\@\@0_N\@Z */ - MCAPI int handleItemRepair(class ItemStackBase &, class ItemStackBase &); + MCAPI struct RepairItemResult handleItemRepair(class ItemStack &, class ItemStack &, bool); /** * @symbol ?isValidRepairItem\@RepairableItemComponent\@\@QEBA_NAEBVItemStackBase\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/RepeaterBlock.hpp b/LiteLoader/include/llapi/mc/RepeaterBlock.hpp index 965f853dbd..27d7fd2706 100644 --- a/LiteLoader/include/llapi/mc/RepeaterBlock.hpp +++ b/LiteLoader/include/llapi/mc/RepeaterBlock.hpp @@ -40,16 +40,21 @@ class RepeaterBlock : public DiodeBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class RepeaterBlock : public DiodeBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class RepeaterBlock : public DiodeBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,187 +131,182 @@ class RepeaterBlock : public DiodeBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 64 + * @vftbl 63 * @symbol ?shouldConnectToRedstone\@RepeaterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@RepeaterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@RepeaterBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@RepeaterBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@RepeaterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@RepeaterBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 196 + * @vftbl 195 * @symbol ?isLocked\@RepeaterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isLocked(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 202 + * @vftbl 201 * @symbol ?isAlternateInput\@RepeaterBlock\@\@MEBA_NAEBVBlock\@\@\@Z */ virtual bool isAlternateInput(class Block const &) const; /** - * @vftbl 206 + * @vftbl 205 * @symbol ?getTurnOnDelay\@RepeaterBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int getTurnOnDelay(class Block const &) const; /** - * @vftbl 207 + * @vftbl 206 * @symbol ?getOnBlock\@RepeaterBlock\@\@MEBAPEBVBlock\@\@PEBV2\@\@Z */ virtual class Block const * getOnBlock(class Block const *) const; /** - * @vftbl 208 + * @vftbl 207 * @symbol ?getOffBlock\@RepeaterBlock\@\@MEBAPEBVBlock\@\@PEBV2\@\@Z */ virtual class Block const * getOffBlock(class Block const *) const; diff --git a/LiteLoader/include/llapi/mc/RequestAbilityPacket.hpp b/LiteLoader/include/llapi/mc/RequestAbilityPacket.hpp index baeaaea8fd..9d6a2a5f8a 100644 --- a/LiteLoader/include/llapi/mc/RequestAbilityPacket.hpp +++ b/LiteLoader/include/llapi/mc/RequestAbilityPacket.hpp @@ -49,9 +49,9 @@ class RequestAbilityPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@RequestAbilityPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@RequestAbilityPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_REQUESTABILITYPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/RequestChunkRadiusPacket.hpp b/LiteLoader/include/llapi/mc/RequestChunkRadiusPacket.hpp index d76da3ff20..07f2e4ab22 100644 --- a/LiteLoader/include/llapi/mc/RequestChunkRadiusPacket.hpp +++ b/LiteLoader/include/llapi/mc/RequestChunkRadiusPacket.hpp @@ -51,9 +51,9 @@ class RequestChunkRadiusPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@RequestChunkRadiusPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@RequestChunkRadiusPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0RequestChunkRadiusPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/RequestNetworkSettingsPacket.hpp b/LiteLoader/include/llapi/mc/RequestNetworkSettingsPacket.hpp index 44122d44ca..766d587a37 100644 --- a/LiteLoader/include/llapi/mc/RequestNetworkSettingsPacket.hpp +++ b/LiteLoader/include/llapi/mc/RequestNetworkSettingsPacket.hpp @@ -49,9 +49,9 @@ class RequestNetworkSettingsPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@RequestNetworkSettingsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@RequestNetworkSettingsPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0RequestNetworkSettingsPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/RequestPermissionsPacket.hpp b/LiteLoader/include/llapi/mc/RequestPermissionsPacket.hpp index 069c5280ff..a4410bb195 100644 --- a/LiteLoader/include/llapi/mc/RequestPermissionsPacket.hpp +++ b/LiteLoader/include/llapi/mc/RequestPermissionsPacket.hpp @@ -49,9 +49,9 @@ class RequestPermissionsPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@RequestPermissionsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@RequestPermissionsPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0RequestPermissionsPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ResetFrictionModifierSystem.hpp b/LiteLoader/include/llapi/mc/ResetFrictionModifierSystem.hpp index 0cf00b9132..2e0ae3a275 100644 --- a/LiteLoader/include/llapi/mc/ResetFrictionModifierSystem.hpp +++ b/LiteLoader/include/llapi/mc/ResetFrictionModifierSystem.hpp @@ -28,12 +28,12 @@ class ResetFrictionModifierSystem { public: /** - * @symbol ?createResetFrictionModifierSystem\@ResetFrictionModifierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@ResetFrictionModifierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static struct TickingSystemWithInfo createResetFrictionModifierSystem(); + MCAPI static struct TickingSystemWithInfo createSystem(); /** - * @symbol ?tickResetFrictionModifierSystem\@ResetFrictionModifierSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@UPlayerInputRequestComponent\@\@UVanillaClientGameplayComponent\@\@\@\@UFrictionModifierComponent\@\@\@\@\@Z + * @symbol ?tickResetFrictionModifierSystem\@ResetFrictionModifierSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@UPlayerInputRequestComponent\@\@\@\@UFrictionModifierComponent\@\@\@\@\@Z */ - MCAPI static void tickResetFrictionModifierSystem(class ViewT, class FlagComponent, struct PlayerInputRequestComponent, struct VanillaClientGameplayComponent>, struct FrictionModifierComponent>); + MCAPI static void tickResetFrictionModifierSystem(class ViewT, struct PlayerInputRequestComponent>, struct FrictionModifierComponent>); }; diff --git a/LiteLoader/include/llapi/mc/ResourceLocation.hpp b/LiteLoader/include/llapi/mc/ResourceLocation.hpp index 719c575f78..65665f4b0d 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\@AEBVPath\@Core\@\@\@Z - */ - MCAPI ResourceLocation(class Core::Path const &); /** * @symbol ??0ResourceLocation\@\@QEAA\@XZ */ MCAPI ResourceLocation(); + /** + * @symbol ??0ResourceLocation\@\@QEAA\@AEBVPath\@Core\@\@\@Z + */ + MCAPI ResourceLocation(class Core::Path const &); /** * @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 8ba21d97b9..6c61649a6d 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackChunkDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackChunkDataPacket.hpp @@ -51,9 +51,9 @@ class ResourcePackChunkDataPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ResourcePackChunkDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ResourcePackChunkDataPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 3a6ebb5452..da88b91d11 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackChunkRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackChunkRequestPacket.hpp @@ -51,9 +51,9 @@ class ResourcePackChunkRequestPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ResourcePackChunkRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ResourcePackChunkRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ResourcePackChunkRequestPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ResourcePackClientResponsePacket.hpp b/LiteLoader/include/llapi/mc/ResourcePackClientResponsePacket.hpp index 3aa846822b..b9478a06d0 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackClientResponsePacket.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackClientResponsePacket.hpp @@ -51,9 +51,9 @@ class ResourcePackClientResponsePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ResourcePackClientResponsePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ResourcePackClientResponsePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ResourcePackClientResponsePacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ResourcePackDataInfoPacket.hpp b/LiteLoader/include/llapi/mc/ResourcePackDataInfoPacket.hpp index fd637be352..5bd0df9fc8 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackDataInfoPacket.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackDataInfoPacket.hpp @@ -58,22 +58,22 @@ class ResourcePackDataInfoPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ResourcePackDataInfoPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ResourcePackDataInfoPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_RESOURCEPACKDATAINFOPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~ResourcePackDataInfoPacket(); #endif - /** - * @symbol ??0ResourcePackDataInfoPacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@IH_K0_NW4PackType\@\@\@Z - */ - MCAPI ResourcePackDataInfoPacket(std::string const &, unsigned int, int, unsigned __int64, std::string const &, bool, enum class PackType); /** * @symbol ??0ResourcePackDataInfoPacket\@\@QEAA\@XZ */ MCAPI ResourcePackDataInfoPacket(); + /** + * @symbol ??0ResourcePackDataInfoPacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@IH_K0_NW4PackType\@\@\@Z + */ + MCAPI ResourcePackDataInfoPacket(std::string const &, unsigned int, int, unsigned __int64, std::string const &, bool, enum class PackType); }; diff --git a/LiteLoader/include/llapi/mc/ResourcePackManager.hpp b/LiteLoader/include/llapi/mc/ResourcePackManager.hpp index 1e6be756da..6477329677 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackManager.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackManager.hpp @@ -142,6 +142,10 @@ class ResourcePackManager { * @symbol ?hasResource\@ResourcePackManager\@\@QEBA_NAEBVResourceLocation\@\@\@Z */ MCAPI bool hasResource(class ResourceLocation const &) const; + /** + * @symbol ?isOnlyBaseGamePacks\@ResourcePackManager\@\@QEBA_NXZ + */ + MCAPI bool isOnlyBaseGamePacks() const; /** * @symbol ?iteratePacks\@ResourcePackManager\@\@QEBAXAEBV?$function\@$$A6AXAEBVPackInstance\@\@\@Z\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ResourcePackPaths.hpp b/LiteLoader/include/llapi/mc/ResourcePackPaths.hpp index c8deb923a6..65ea7ef21a 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackPaths.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackPaths.hpp @@ -70,18 +70,10 @@ namespace ResourcePackPaths { * @symbol ?getCachedResourcePacksPath\@ResourcePackPaths\@\@YA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCAPI class Core::PathBuffer getCachedResourcePacksPath(); - /** - * @symbol ?getPremiumBehaviorPackPath\@ResourcePackPaths\@\@YA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ - */ - MCAPI class Core::PathBuffer getPremiumBehaviorPackPath(); /** * @symbol ?getPremiumPackPath\@ResourcePackPaths\@\@YA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCAPI class Core::PathBuffer getPremiumPackPath(); - /** - * @symbol ?getPremiumResourcePackPath\@ResourcePackPaths\@\@YA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ - */ - MCAPI class Core::PathBuffer getPremiumResourcePackPath(); /** * @symbol ?getPremiumWorldTemplatePath\@ResourcePackPaths\@\@YA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ResourcePackStackPacket.hpp b/LiteLoader/include/llapi/mc/ResourcePackStackPacket.hpp index 5674603c1a..85ae9dae9c 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackStackPacket.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackStackPacket.hpp @@ -51,9 +51,9 @@ class ResourcePackStackPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ResourcePackStackPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ResourcePackStackPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 3f01e85b58..7a3ca0521f 100644 --- a/LiteLoader/include/llapi/mc/ResourcePacksInfoPacket.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePacksInfoPacket.hpp @@ -58,9 +58,9 @@ class ResourcePacksInfoPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ResourcePacksInfoPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ResourcePacksInfoPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_RESOURCEPACKSINFOPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/RespawnAnchorBlock.hpp b/LiteLoader/include/llapi/mc/RespawnAnchorBlock.hpp index 75dde4b41f..720718774d 100644 --- a/LiteLoader/include/llapi/mc/RespawnAnchorBlock.hpp +++ b/LiteLoader/include/llapi/mc/RespawnAnchorBlock.hpp @@ -40,16 +40,21 @@ class RespawnAnchorBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class RespawnAnchorBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class RespawnAnchorBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,152 +131,147 @@ class RespawnAnchorBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 - */ - virtual void __unk_vfn_126(); - /** - * @vftbl 127 + * @vftbl 125 * @symbol ?getComparatorSignal\@RespawnAnchorBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 130 + * @vftbl 128 * @symbol ?canSpawnAt\@RespawnAnchorBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSpawnAt(class BlockSource const &, class BlockPos const &) const; /** - * @vftbl 131 + * @vftbl 129 * @symbol ?notifySpawnedAt\@RespawnAnchorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void notifySpawnedAt(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@RespawnAnchorBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@RespawnAnchorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 154 + * @vftbl 152 * @symbol ?getLightEmission\@RespawnAnchorBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@RespawnAnchorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@RespawnAnchorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 + * @vftbl 187 * @symbol ?playerDestroy\@RespawnAnchorBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@RespawnAnchorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/RespawnPacket.hpp b/LiteLoader/include/llapi/mc/RespawnPacket.hpp index 1a18b78a44..25b66a76f6 100644 --- a/LiteLoader/include/llapi/mc/RespawnPacket.hpp +++ b/LiteLoader/include/llapi/mc/RespawnPacket.hpp @@ -79,9 +79,9 @@ return #var; virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@RespawnPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@RespawnPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_RESPAWNPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/RootedDirtBlock.hpp b/LiteLoader/include/llapi/mc/RootedDirtBlock.hpp index 76ae6cb78a..89ab6a55f5 100644 --- a/LiteLoader/include/llapi/mc/RootedDirtBlock.hpp +++ b/LiteLoader/include/llapi/mc/RootedDirtBlock.hpp @@ -40,16 +40,21 @@ class RootedDirtBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class RootedDirtBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class RootedDirtBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,130 +131,125 @@ class RootedDirtBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 52 + * @vftbl 51 * @symbol ?canBeOriginalSurface\@RootedDirtBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_53(); + /** + * @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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@RootedDirtBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@RootedDirtBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 95 + * @vftbl 94 * @symbol ?tryToTill\@RootedDirtBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@AEAVItemStack\@\@\@Z */ virtual bool tryToTill(class BlockSource &, class BlockPos const &, class Actor &, class ItemStack &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@RootedDirtBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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/RotateAndSetVelocitySystem.hpp b/LiteLoader/include/llapi/mc/RotateAndSetVelocitySystem.hpp new file mode 100644 index 0000000000..0a31cc1a15 --- /dev/null +++ b/LiteLoader/include/llapi/mc/RotateAndSetVelocitySystem.hpp @@ -0,0 +1,40 @@ +/** + * @file RotateAndSetVelocitySystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class RotateAndSetVelocitySystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ROTATEANDSETVELOCITYSYSTEM +public: + class RotateAndSetVelocitySystem& operator=(class RotateAndSetVelocitySystem const &) = delete; + RotateAndSetVelocitySystem(class RotateAndSetVelocitySystem const &) = delete; + RotateAndSetVelocitySystem() = delete; +#endif + +public: + /** + * @symbol ?createSystem\@RotateAndSetVelocitySystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createSystem(); + /** + * @symbol ?doTick\@RotateAndSetVelocitySystem\@\@SAXAEBUMoveInputComponent\@\@AEBUPlayerInputModeComponent\@\@AEBUVRMoveAdjustAngleComponent\@\@AEAULocalMoveVelocityComponent\@\@\@Z + */ + MCAPI static void doTick(struct MoveInputComponent const &, struct PlayerInputModeComponent const &, struct VRMoveAdjustAngleComponent const &, struct LocalMoveVelocityComponent &); + /** + * @symbol ?tick\@RotateAndSetVelocitySystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPlayerInputRequestComponent\@\@\@\@$$CBUMoveInputComponent\@\@$$CBUPlayerInputModeComponent\@\@$$CBUVRMoveAdjustAngleComponent\@\@ULocalMoveVelocityComponent\@\@\@\@\@Z + */ + MCAPI static void tick(class ViewT, struct MoveInputComponent const, struct PlayerInputModeComponent const, struct VRMoveAdjustAngleComponent const, struct LocalMoveVelocityComponent>); + +}; diff --git a/LiteLoader/include/llapi/mc/RotatedPillarBlock.hpp b/LiteLoader/include/llapi/mc/RotatedPillarBlock.hpp index 8c053d613a..30cd6b97ec 100644 --- a/LiteLoader/include/llapi/mc/RotatedPillarBlock.hpp +++ b/LiteLoader/include/llapi/mc/RotatedPillarBlock.hpp @@ -40,16 +40,21 @@ class RotatedPillarBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class RotatedPillarBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class RotatedPillarBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,122 +131,117 @@ class RotatedPillarBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@RotatedPillarBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 150 + * @vftbl 148 * @symbol ?getMappedFace\@RotatedPillarBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @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 acf686a932..df5075a7dd 100644 --- a/LiteLoader/include/llapi/mc/RotatedPillarInfestedBlock.hpp +++ b/LiteLoader/include/llapi/mc/RotatedPillarInfestedBlock.hpp @@ -40,16 +40,21 @@ class RotatedPillarInfestedBlock : public RotatedPillarBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class RotatedPillarInfestedBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class RotatedPillarInfestedBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,117 +131,112 @@ class RotatedPillarInfestedBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 102 + * @vftbl 101 * @symbol ?spawnResources\@RotatedPillarInfestedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_169(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_173(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_177(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 - */ - virtual void __unk_vfn_187(); - /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@RotatedPillarInfestedBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@RotatedPillarInfestedBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/SaddleItem.hpp b/LiteLoader/include/llapi/mc/SaddleItem.hpp index 14bf1f5129..6c0a8c6982 100644 --- a/LiteLoader/include/llapi/mc/SaddleItem.hpp +++ b/LiteLoader/include/llapi/mc/SaddleItem.hpp @@ -31,11 +31,6 @@ class SaddleItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -51,6 +46,11 @@ class SaddleItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -101,6 +101,16 @@ class SaddleItem : public Item { * @symbol ?dispense\@SaddleItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); /** * @symbol ??0SaddleItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@F\@Z */ diff --git a/LiteLoader/include/llapi/mc/Salmon.hpp b/LiteLoader/include/llapi/mc/Salmon.hpp index 67cf2dd499..cce03fc5fc 100644 --- a/LiteLoader/include/llapi/mc/Salmon.hpp +++ b/LiteLoader/include/llapi/mc/Salmon.hpp @@ -37,130 +37,125 @@ class Salmon : public Fish { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_267(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_293(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_297(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 - */ - virtual void __unk_vfn_305(); - /** - * @vftbl 331 + * @vftbl 323 * @symbol ?createAIGoals\@Salmon\@\@UEAA_NXZ */ virtual bool createAIGoals(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0Salmon\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SandBlock.hpp b/LiteLoader/include/llapi/mc/SandBlock.hpp index 538c090e99..e3c79b9eb1 100644 --- a/LiteLoader/include/llapi/mc/SandBlock.hpp +++ b/LiteLoader/include/llapi/mc/SandBlock.hpp @@ -5,7 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "HeavyBlock.hpp" +#include "FallingBlock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +16,7 @@ * @brief MC class SandBlock. * */ -class SandBlock : public HeavyBlock { +class SandBlock : public FallingBlock { #define AFTER_EXTRA // Add Member There @@ -40,16 +40,21 @@ class SandBlock : public HeavyBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class SandBlock : public HeavyBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class SandBlock : public HeavyBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,175 +131,170 @@ class SandBlock : public HeavyBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 52 + * @vftbl 51 * @symbol ?canBeOriginalSurface\@SandBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_53(); + /** + * @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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@SandBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 86 * @symbol ?mayConsumeFertilizer\@SandBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@SandBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@SandBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@SandBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@SandBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 186 + * @vftbl 185 * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@SandBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@SandBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 195 + * @vftbl 194 * @symbol ?getDustColor\@SandBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 196 + * @vftbl 195 * @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 197 - * @symbol __unk_vfn_197 + * @vftbl 196 + * @symbol __unk_vfn_196 */ - virtual void __unk_vfn_197(); + virtual void __unk_vfn_196(); /** * @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 149bbb4d28..95a3c09cc3 100644 --- a/LiteLoader/include/llapi/mc/SandStoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/SandStoneBlock.hpp @@ -1,5 +1,5 @@ /** - * @file SandStoneBlock.hpp + * @file SandstoneBlock.hpp * */ #pragma once @@ -16,7 +16,7 @@ * @brief MC class SandStoneBlock. * */ -class SandStoneBlock : public BlockLegacy { +class SandstoneBlock : public BlockLegacy { #define AFTER_EXTRA // Add Member There @@ -24,9 +24,9 @@ class SandStoneBlock : public BlockLegacy { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_SANDSTONEBLOCK public: - class SandStoneBlock& operator=(class SandStoneBlock const &) = delete; - SandStoneBlock(class SandStoneBlock const &) = delete; - SandStoneBlock() = delete; + class SandstoneBlock& operator=(class SandstoneBlock const &) = delete; + SandstoneBlock(class SandstoneBlock const &) = delete; + SandstoneBlock() = delete; #endif public: @@ -40,16 +40,21 @@ class SandStoneBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class SandStoneBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class SandStoneBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,138 +131,133 @@ class SandStoneBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 51 + * @symbol ?canBeOriginalSurface\@SandstoneBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_49(); + virtual bool canBeOriginalSurface() const; /** - * @vftbl 52 - * @symbol ?canBeOriginalSurface\@SandStoneBlock\@\@UEBA_NXZ + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual bool canBeOriginalSurface() const; + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 102 + * @symbol ?asItemInstance\@SandstoneBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ - virtual void __unk_vfn_82(); + virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@SandStoneBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 - * @symbol ?buildDescriptionId\@SandStoneBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @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 135 - * @symbol ?isAuxValueRelevantForPicking\@SandStoneBlock\@\@UEBA_NXZ + * @vftbl 133 + * @symbol ?isAuxValueRelevantForPicking\@SandstoneBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 - * @symbol ?getResourceItem\@SandStoneBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@SandstoneBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 - * @symbol ?getSilkTouchItemInstance\@SandStoneBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@SandstoneBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0SandStoneBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0SandstoneBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ - MCAPI SandStoneBlock(std::string const &, int, class Material const &); + MCAPI SandstoneBlock(std::string const &, int, class Material const &); }; diff --git a/LiteLoader/include/llapi/mc/Sapling.hpp b/LiteLoader/include/llapi/mc/SaplingBlock.hpp similarity index 52% rename from LiteLoader/include/llapi/mc/Sapling.hpp rename to LiteLoader/include/llapi/mc/SaplingBlock.hpp index 92dc325cda..4a924727f6 100644 --- a/LiteLoader/include/llapi/mc/Sapling.hpp +++ b/LiteLoader/include/llapi/mc/SaplingBlock.hpp @@ -1,5 +1,5 @@ /** - * @file Sapling.hpp + * @file SaplingBlock.hpp * */ #pragma once @@ -8,25 +8,20 @@ #include "BushBlock.hpp" #define BEFORE_EXTRA -// Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC class Sapling. - * - */ -class Sapling : public BushBlock { + +class SaplingBlock : public BushBlock { #define AFTER_EXTRA -// Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SAPLING +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SAPLINGBLOCK public: - class Sapling& operator=(class Sapling const &) = delete; - Sapling(class Sapling const &) = delete; - Sapling() = delete; + class SaplingBlock& operator=(class SaplingBlock const &) = delete; + SaplingBlock(class SaplingBlock const &) = delete; + SaplingBlock() = delete; #endif public: @@ -40,16 +35,21 @@ class Sapling : public BushBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +61,10 @@ class Sapling : public BushBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +96,10 @@ class Sapling : public BushBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,15 +126,15 @@ class Sapling : public BushBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -142,190 +142,185 @@ class Sapling : public BushBlock { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 - * @symbol ?canContainLiquid\@Sapling\@\@UEBA_NXZ + * @symbol ?canContainLiquid\@SaplingBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 - * @symbol ?onFertilized\@Sapling\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 85 + * @symbol ?onFertilized\@SaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 - * @symbol ?canBeFertilized\@Sapling\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 87 + * @symbol ?canBeFertilized\@SaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 - * @symbol ?mayPlace\@Sapling\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 91 + * @symbol ?mayPlace\@SaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@Sapling\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 102 + * @symbol ?asItemInstance\@SaplingBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 - * @symbol ?buildDescriptionId\@Sapling\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @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 135 - * @symbol ?isAuxValueRelevantForPicking\@Sapling\@\@UEBA_NXZ + * @vftbl 133 + * @symbol ?isAuxValueRelevantForPicking\@SaplingBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 147 - * @symbol ?getVariant\@Sapling\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 145 + * @symbol ?getVariant\@SaplingBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 + */ + virtual void __unk_vfn_155(); + /** + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + 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 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_167(); - /** - * @vftbl 168 - * @symbol __unk_vfn_168 - */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_169(); /** * @vftbl 171 - * @symbol __unk_vfn_171 + * @symbol ?randomTick\@SaplingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ - virtual void __unk_vfn_171(); + virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** * @vftbl 173 - * @symbol ?randomTick\@Sapling\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @symbol __unk_vfn_173 */ - virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; + virtual void __unk_vfn_173(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_177(); /** * @vftbl 179 - * @symbol __unk_vfn_179 - */ - virtual void __unk_vfn_179(); - /** - * @vftbl 181 - * @symbol ?getRenderLayer\@Sapling\@\@UEBA?AW4BlockRenderLayer\@\@XZ + * @symbol ?getRenderLayer\@SaplingBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 182 - * @symbol ?getRenderLayer\@Sapling\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 180 + * @symbol ?getRenderLayer\@SaplingBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 - * @symbol ?getResourceItem\@Sapling\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@SaplingBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 - * @symbol ?getSilkTouchItemInstance\@Sapling\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@SaplingBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SAPLING +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SAPLINGBLOCK /** * @symbol __unk_destructor_-1 */ - MCVAPI ~Sapling(); + MCVAPI ~SaplingBlock(); #endif /** - * @symbol ??0Sapling\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0SaplingBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ - MCAPI Sapling(std::string const &, int); + MCAPI SaplingBlock(std::string const &, int); //protected: /** - * @symbol ?advanceTree\@Sapling\@\@IEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@PEAVActor\@\@\@Z + * @symbol ?advanceTree\@SaplingBlock\@\@IEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@PEAVActor\@\@\@Z */ MCAPI bool advanceTree(class BlockSource &, class BlockPos const &, class Random &, class Actor *) const; //private: /** - * @symbol ?_generateJungleTree\@Sapling\@\@AEBA?AV?$WeakRefT\@UFeatureRefTraits\@\@\@\@AEAH0AEA_NAEBVBlockPos\@\@AEAVBlockSource\@\@AEBVFeatureRegistry\@\@\@Z + * @symbol ?_generateJungleTree\@SaplingBlock\@\@AEBA?AV?$WeakRefT\@UFeatureRefTraits\@\@\@\@AEAH0AEA_NAEBVBlockPos\@\@AEAVBlockSource\@\@AEBVFeatureRegistry\@\@\@Z */ MCAPI class WeakRefT _generateJungleTree(int &, int &, bool &, class BlockPos const &, class BlockSource &, class FeatureRegistry const &) const; /** - * @symbol ?_generateOakTree\@Sapling\@\@AEBA?AV?$WeakRefT\@UFeatureRefTraits\@\@\@\@AEBVFeatureRegistry\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@AEAVRandom\@\@_N\@Z + * @symbol ?_generateOakTree\@SaplingBlock\@\@AEBA?AV?$WeakRefT\@UFeatureRefTraits\@\@\@\@AEBVFeatureRegistry\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@AEAVRandom\@\@_N\@Z */ MCAPI class WeakRefT _generateOakTree(class FeatureRegistry const &, class BlockPos const &, class BlockSource &, class Random &, bool) const; /** - * @symbol ?_generateRedwoodTree\@Sapling\@\@AEBA?AV?$WeakRefT\@UFeatureRefTraits\@\@\@\@AEAH0AEA_NAEBVBlockPos\@\@AEAVBlockSource\@\@AEBVFeatureRegistry\@\@\@Z + * @symbol ?_generateRedwoodTree\@SaplingBlock\@\@AEBA?AV?$WeakRefT\@UFeatureRefTraits\@\@\@\@AEAH0AEA_NAEBVBlockPos\@\@AEAVBlockSource\@\@AEBVFeatureRegistry\@\@\@Z */ MCAPI class WeakRefT _generateRedwoodTree(int &, int &, bool &, class BlockPos const &, class BlockSource &, class FeatureRegistry const &) const; /** - * @symbol ?_generateRoofTree\@Sapling\@\@AEBA?AV?$WeakRefT\@UFeatureRefTraits\@\@\@\@AEAH0AEA_NAEBVBlockPos\@\@AEAVBlockSource\@\@AEBVFeatureRegistry\@\@\@Z + * @symbol ?_generateRoofTree\@SaplingBlock\@\@AEBA?AV?$WeakRefT\@UFeatureRefTraits\@\@\@\@AEAH0AEA_NAEBVBlockPos\@\@AEAVBlockSource\@\@AEBVFeatureRegistry\@\@\@Z */ MCAPI class WeakRefT _generateRoofTree(int &, int &, bool &, class BlockPos const &, class BlockSource &, class FeatureRegistry const &) const; /** - * @symbol ?_growTree\@Sapling\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@_N\@Z + * @symbol ?_growTree\@SaplingBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@_N\@Z */ MCAPI bool _growTree(class BlockSource &, class BlockPos const &, class Random &, bool) const; diff --git a/LiteLoader/include/llapi/mc/SaplingBlockItem.hpp b/LiteLoader/include/llapi/mc/SaplingBlockItem.hpp index 4aada9a913..77e1c910d1 100644 --- a/LiteLoader/include/llapi/mc/SaplingBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/SaplingBlockItem.hpp @@ -36,11 +36,6 @@ class SaplingBlockItem : public BlockItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class SaplingBlockItem : public BlockItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 45 * @symbol ?getLevelDataForAuxValue\@SaplingBlockItem\@\@UEBAHH\@Z @@ -111,5 +111,15 @@ class SaplingBlockItem : public BlockItem { * @symbol ?buildDescriptionId\@SaplingBlockItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); }; diff --git a/LiteLoader/include/llapi/mc/SavedDataStorage.hpp b/LiteLoader/include/llapi/mc/SavedDataStorage.hpp index 54e7b9c1cb..2396774729 100644 --- a/LiteLoader/include/llapi/mc/SavedDataStorage.hpp +++ b/LiteLoader/include/llapi/mc/SavedDataStorage.hpp @@ -29,6 +29,12 @@ class SavedDataStorage { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SAVEDDATASTORAGE + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~SavedDataStorage(); +#endif /** * @symbol ??0SavedDataStorage\@\@QEAA\@PEAVLevelStorage\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ScaffoldingBlock.hpp b/LiteLoader/include/llapi/mc/ScaffoldingBlock.hpp index 33c7d3bd1c..8db2bd125d 100644 --- a/LiteLoader/include/llapi/mc/ScaffoldingBlock.hpp +++ b/LiteLoader/include/llapi/mc/ScaffoldingBlock.hpp @@ -5,7 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "HeavyBlock.hpp" +#include "FallingBlock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +16,7 @@ * @brief MC class ScaffoldingBlock. * */ -class ScaffoldingBlock : public HeavyBlock { +class ScaffoldingBlock : public FallingBlock { #define AFTER_EXTRA // Add Member There @@ -50,16 +50,21 @@ class ScaffoldingBlock : public HeavyBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -72,14 +77,14 @@ class ScaffoldingBlock : public HeavyBlock { virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol __unk_vfn_34 + * @symbol ?isWaterBlocking\@ScaffoldingBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_34(); + virtual bool isWaterBlocking() const; /** * @vftbl 35 - * @symbol ?isWaterBlocking\@ScaffoldingBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_35 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -111,10 +116,10 @@ class ScaffoldingBlock : public HeavyBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -141,20 +146,20 @@ class ScaffoldingBlock : public HeavyBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 52 + * @symbol ?canBeAscendedByJumping\@ScaffoldingBlock\@\@UEBA_NAEBVActor\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_49(); + virtual bool canBeAscendedByJumping(class Actor const &, class BlockPos const &) const; /** * @vftbl 53 - * @symbol ?canBeAscendedByJumping\@ScaffoldingBlock\@\@UEBA_NAEBVActor\@\@AEBVBlockPos\@\@\@Z + * @symbol __unk_vfn_53 */ - virtual bool canBeAscendedByJumping(class Actor const &, class BlockPos const &) const; + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -162,159 +167,154 @@ class ScaffoldingBlock : public HeavyBlock { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@ScaffoldingBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 69 + * @vftbl 68 * @symbol ?checkIsPathable\@ScaffoldingBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@ScaffoldingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 96 + * @vftbl 95 * @symbol ?breaksFallingBlocks\@ScaffoldingBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@ScaffoldingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** * @vftbl 126 - * @symbol __unk_vfn_126 - */ - virtual void __unk_vfn_126(); - /** - * @vftbl 128 * @symbol ?canSlide\@ScaffoldingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSlide(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@ScaffoldingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@ScaffoldingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@ScaffoldingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 176 + * @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 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 195 + * @vftbl 194 * @symbol ?getDustColor\@ScaffoldingBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 196 + * @vftbl 195 * @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 197 - * @symbol __unk_vfn_197 + * @vftbl 196 + * @symbol __unk_vfn_196 */ - virtual void __unk_vfn_197(); + virtual void __unk_vfn_196(); #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 338947522b..a26ba6714f 100644 --- a/LiteLoader/include/llapi/mc/ScaffoldingBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/ScaffoldingBlockItem.hpp @@ -36,11 +36,6 @@ class ScaffoldingBlockItem : public BlockItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class ScaffoldingBlockItem : public BlockItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -102,7 +102,17 @@ class ScaffoldingBlockItem : public BlockItem { */ virtual void __unk_vfn_80(); /** - * @vftbl 132 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 134 * @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 index cadb814345..3428c9a2b8 100644 --- a/LiteLoader/include/llapi/mc/ScaffoldingInputSystem.hpp +++ b/LiteLoader/include/llapi/mc/ScaffoldingInputSystem.hpp @@ -31,5 +31,9 @@ class ScaffoldingInputSystem { * @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/Scoreboard.hpp b/LiteLoader/include/llapi/mc/Scoreboard.hpp index 04ad3225cd..b93d910a32 100644 --- a/LiteLoader/include/llapi/mc/Scoreboard.hpp +++ b/LiteLoader/include/llapi/mc/Scoreboard.hpp @@ -430,14 +430,14 @@ class Scoreboard { * @symbol ?getScoreboardId\@Scoreboard\@\@QEBAAEBUScoreboardId\@\@AEBVActor\@\@\@Z */ MCAPI struct ScoreboardId const & getScoreboardId(class Actor const &) const; - /** - * @symbol ?getScoreboardId\@Scoreboard\@\@QEBAAEBUScoreboardId\@\@AEBVPlayer\@\@\@Z - */ - MCAPI struct ScoreboardId const & getScoreboardId(class Player const &) const; /** * @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 */ @@ -466,22 +466,22 @@ class Scoreboard { * @symbol ?modifyPlayerScore\@Scoreboard\@\@QEAAHAEA_NAEBUScoreboardId\@\@AEAVObjective\@\@HW4PlayerScoreSetFunction\@\@\@Z */ MCAPI int modifyPlayerScore(bool &, struct ScoreboardId const &, class Objective &, int, enum class PlayerScoreSetFunction); - /** - * @symbol ?registerScoreboardIdentity\@Scoreboard\@\@QEAAAEBVScoreboardIdentityRef\@\@AEBUScoreboardId\@\@AEBUActorUniqueID\@\@\@Z - */ - MCAPI class ScoreboardIdentityRef const & registerScoreboardIdentity(struct ScoreboardId const &, struct ActorUniqueID const &); /** * @symbol ?registerScoreboardIdentity\@Scoreboard\@\@QEAAAEBVScoreboardIdentityRef\@\@AEBVCompoundTag\@\@\@Z */ MCAPI class ScoreboardIdentityRef const & registerScoreboardIdentity(class CompoundTag const &); - /** - * @symbol ?registerScoreboardIdentity\@Scoreboard\@\@QEAAAEBVScoreboardIdentityRef\@\@AEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI class ScoreboardIdentityRef const & registerScoreboardIdentity(struct ScoreboardId const &, std::string const &); /** * @symbol ?registerScoreboardIdentity\@Scoreboard\@\@QEAAAEBVScoreboardIdentityRef\@\@AEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z */ MCAPI class ScoreboardIdentityRef const & registerScoreboardIdentity(struct ScoreboardId const &, struct PlayerScoreboardId const &); + /** + * @symbol ?registerScoreboardIdentity\@Scoreboard\@\@QEAAAEBVScoreboardIdentityRef\@\@AEBUScoreboardId\@\@AEBUActorUniqueID\@\@\@Z + */ + MCAPI class ScoreboardIdentityRef const & registerScoreboardIdentity(struct ScoreboardId const &, struct ActorUniqueID const &); + /** + * @symbol ?registerScoreboardIdentity\@Scoreboard\@\@QEAAAEBVScoreboardIdentityRef\@\@AEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI class ScoreboardIdentityRef const & registerScoreboardIdentity(struct ScoreboardId const &, std::string const &); /** * @symbol ?removeObjective\@Scoreboard\@\@QEAA_NPEAVObjective\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ScreenHandlerBase.hpp b/LiteLoader/include/llapi/mc/ScreenHandlerBase.hpp index c7c5b57bbe..147bd1b0a4 100644 --- a/LiteLoader/include/llapi/mc/ScreenHandlerBase.hpp +++ b/LiteLoader/include/llapi/mc/ScreenHandlerBase.hpp @@ -53,14 +53,6 @@ class ScreenHandlerBase { * @symbol ?postRequest\@ScreenHandlerBase\@\@UEAAX_N\@Z */ MCVAPI void postRequest(bool); - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~ScreenHandlerBase(); #endif - /** - * @symbol ??0ScreenHandlerBase\@\@QEAA\@AEAVItemStackRequestActionHandler\@\@\@Z - */ - MCAPI ScreenHandlerBase(class ItemStackRequestActionHandler &); }; diff --git a/LiteLoader/include/llapi/mc/ScreenHandlerBeacon.hpp b/LiteLoader/include/llapi/mc/ScreenHandlerBeacon.hpp index faa61ee7b5..7bddeef5ec 100644 --- a/LiteLoader/include/llapi/mc/ScreenHandlerBeacon.hpp +++ b/LiteLoader/include/llapi/mc/ScreenHandlerBeacon.hpp @@ -54,10 +54,6 @@ class ScreenHandlerBeacon { * @symbol ?postRequest\@ScreenHandlerBeacon\@\@MEAAX_N\@Z */ virtual void postRequest(bool); - /** - * @symbol ??0ScreenHandlerBeacon\@\@QEAA\@AEBVContainerScreenContext\@\@AEAVItemStackRequestActionHandler\@\@\@Z - */ - MCAPI ScreenHandlerBeacon(class ContainerScreenContext const &, class ItemStackRequestActionHandler &); //private: /** diff --git a/LiteLoader/include/llapi/mc/ScreenHandlerLabTable.hpp b/LiteLoader/include/llapi/mc/ScreenHandlerLabTable.hpp index 25302eaacd..f31e3c92e7 100644 --- a/LiteLoader/include/llapi/mc/ScreenHandlerLabTable.hpp +++ b/LiteLoader/include/llapi/mc/ScreenHandlerLabTable.hpp @@ -54,10 +54,6 @@ class ScreenHandlerLabTable { * @symbol ?postRequest\@ScreenHandlerLabTable\@\@MEAAX_N\@Z */ virtual void postRequest(bool); - /** - * @symbol ??0ScreenHandlerLabTable\@\@QEAA\@AEBVContainerScreenContext\@\@AEAVItemStackRequestActionHandler\@\@\@Z - */ - MCAPI ScreenHandlerLabTable(class ContainerScreenContext const &, class ItemStackRequestActionHandler &); //private: /** diff --git a/LiteLoader/include/llapi/mc/ScriptBindingReleaseList.hpp b/LiteLoader/include/llapi/mc/ScriptBindingReleaseList.hpp index d657c7e03e..a76ae39750 100644 --- a/LiteLoader/include/llapi/mc/ScriptBindingReleaseList.hpp +++ b/LiteLoader/include/llapi/mc/ScriptBindingReleaseList.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Scripting.hpp" #define BEFORE_EXTRA @@ -29,8 +28,8 @@ class ScriptBindingReleaseList { public: /** - * @symbol ??0ScriptBindingReleaseList\@\@QEAA\@V?$vector\@U?$pair\@PEBQEBDUVersion\@Scripting\@\@\@std\@\@V?$allocator\@U?$pair\@PEBQEBDUVersion\@Scripting\@\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ??0ScriptBindingReleaseList\@\@QEAA\@V?$vector\@UReleaseDetails\@ScriptBindingReleaseList\@\@V?$allocator\@UReleaseDetails\@ScriptBindingReleaseList\@\@\@std\@\@\@std\@\@\@Z */ - MCAPI ScriptBindingReleaseList(std::vector>); + MCAPI ScriptBindingReleaseList(std::vector); }; diff --git a/LiteLoader/include/llapi/mc/ScriptCustomEventPacket.hpp b/LiteLoader/include/llapi/mc/ScriptCustomEventPacket.hpp index 7116dcf8f9..70fbfee69f 100644 --- a/LiteLoader/include/llapi/mc/ScriptCustomEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/ScriptCustomEventPacket.hpp @@ -51,9 +51,9 @@ class ScriptCustomEventPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ScriptCustomEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ScriptCustomEventPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ScriptCustomEventPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ScriptItemGameplayHandler.hpp b/LiteLoader/include/llapi/mc/ScriptItemGameplayHandler.hpp index 23eb645a89..47c1f49518 100644 --- a/LiteLoader/include/llapi/mc/ScriptItemGameplayHandler.hpp +++ b/LiteLoader/include/llapi/mc/ScriptItemGameplayHandler.hpp @@ -76,16 +76,21 @@ class ScriptItemGameplayHandler { virtual void __unk_vfn_8(); /** * @vftbl 9 + * @symbol __unk_vfn_9 + */ + virtual void __unk_vfn_9(); + /** + * @vftbl 10 * @symbol ?handleEvent\@ScriptItemGameplayHandler\@\@UEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEAUItemDefinitionEventTriggeredEvent\@\@\@Z */ virtual struct GameplayHandlerResult handleEvent(struct ItemDefinitionEventTriggeredEvent &); /** - * @vftbl 10 + * @vftbl 11 * @symbol ?handleEvent\@ScriptItemGameplayHandler\@\@UEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEAUItemUseOnEvent\@\@\@Z */ virtual struct GameplayHandlerResult handleEvent(struct ItemUseOnEvent &); /** - * @vftbl 11 + * @vftbl 12 * @symbol ?handleEvent\@ScriptItemGameplayHandler\@\@UEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEAUItemUseEvent\@\@\@Z */ virtual struct GameplayHandlerResult handleEvent(struct ItemUseEvent &); diff --git a/LiteLoader/include/llapi/mc/ScriptMessagePacket.hpp b/LiteLoader/include/llapi/mc/ScriptMessagePacket.hpp index b060f77d27..d91e314277 100644 --- a/LiteLoader/include/llapi/mc/ScriptMessagePacket.hpp +++ b/LiteLoader/include/llapi/mc/ScriptMessagePacket.hpp @@ -49,9 +49,9 @@ class ScriptMessagePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ScriptMessagePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ScriptMessagePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCRIPTMESSAGEPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ScriptMinecraftUIModuleFactory.hpp b/LiteLoader/include/llapi/mc/ScriptMinecraftServerUIModuleFactory.hpp similarity index 65% rename from LiteLoader/include/llapi/mc/ScriptMinecraftUIModuleFactory.hpp rename to LiteLoader/include/llapi/mc/ScriptMinecraftServerUIModuleFactory.hpp index 0d0bd968bb..2fb2d37e9c 100644 --- a/LiteLoader/include/llapi/mc/ScriptMinecraftUIModuleFactory.hpp +++ b/LiteLoader/include/llapi/mc/ScriptMinecraftServerUIModuleFactory.hpp @@ -1,5 +1,5 @@ /** - * @file ScriptMinecraftUIModuleFactory.hpp + * @file ScriptMinecraftServerUIModuleFactory.hpp * */ #pragma once @@ -11,19 +11,16 @@ #undef BEFORE_EXTRA -/** - * @brief MC class ScriptMinecraftUIModuleFactory. - * - */ -class ScriptMinecraftUIModuleFactory { + +class ScriptMinecraftServerUIModuleFactory { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SCRIPTMINECRAFTUIMODULEFACTORY +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SCRIPTMINECRAFTSERVERUIMODULEFACTORY public: - class ScriptMinecraftUIModuleFactory& operator=(class ScriptMinecraftUIModuleFactory const &) = delete; - ScriptMinecraftUIModuleFactory(class ScriptMinecraftUIModuleFactory const &) = delete; + class ScriptMinecraftServerUIModuleFactory& operator=(class ScriptMinecraftServerUIModuleFactory const &) = delete; + ScriptMinecraftServerUIModuleFactory(class ScriptMinecraftServerUIModuleFactory const &) = delete; #endif public: @@ -63,35 +60,35 @@ class ScriptMinecraftUIModuleFactory { */ virtual class std::optional createModuleBinding(struct Scripting::Version, class std::optional const &); /** - * @symbol ??0ScriptMinecraftUIModuleFactory\@\@QEAA\@XZ + * @symbol ??0ScriptMinecraftServerUIModuleFactory\@\@QEAA\@XZ */ - MCAPI ScriptMinecraftUIModuleFactory(); + MCAPI ScriptMinecraftServerUIModuleFactory(); /** - * @symbol ?getModuleUUIDAsString\@ScriptMinecraftUIModuleFactory\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getModuleUUIDAsString\@ScriptMinecraftServerUIModuleFactory\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI static std::string getModuleUUIDAsString(); //private: /** - * @symbol ?_addVersions\@ScriptMinecraftUIModuleFactory\@\@AEAAXXZ + * @symbol ?_addVersions\@ScriptMinecraftServerUIModuleFactory\@\@AEAAXXZ */ MCAPI void _addVersions(); /** - * @symbol ?_generateBindings\@ScriptMinecraftUIModuleFactory\@\@AEAA?AUModuleBinding\@Scripting\@\@AEAVModuleBindingBuilder\@3\@_NAEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?_generateBindings\@ScriptMinecraftServerUIModuleFactory\@\@AEAA?AUModuleBinding\@Scripting\@\@AEAVModuleBindingBuilder\@3\@_NAEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI struct Scripting::ModuleBinding _generateBindings(class Scripting::ModuleBindingBuilder &, bool, std::vector const &); private: /** - * @symbol ?LegacyModuleName\@ScriptMinecraftUIModuleFactory\@\@0PEBDEB + * @symbol ?LegacyModuleName\@ScriptMinecraftServerUIModuleFactory\@\@0PEBDEB */ MCAPI static char const * LegacyModuleName; /** - * @symbol ?ModuleName\@ScriptMinecraftUIModuleFactory\@\@0PEBDEB + * @symbol ?ModuleName\@ScriptMinecraftServerUIModuleFactory\@\@0PEBDEB */ MCAPI static char const * ModuleName; /** - * @symbol ?ModuleUUID\@ScriptMinecraftUIModuleFactory\@\@0VUUID\@mce\@\@B + * @symbol ?ModuleUUID\@ScriptMinecraftServerUIModuleFactory\@\@0VUUID\@mce\@\@B */ MCAPI static class mce::UUID const ModuleUUID; diff --git a/LiteLoader/include/llapi/mc/ScriptModuleMinecraft.hpp b/LiteLoader/include/llapi/mc/ScriptModuleMinecraft.hpp index 799d050b32..7436bc8e4a 100644 --- a/LiteLoader/include/llapi/mc/ScriptModuleMinecraft.hpp +++ b/LiteLoader/include/llapi/mc/ScriptModuleMinecraft.hpp @@ -50,6 +50,10 @@ struct ScriptNavigationResult { MCAPI ~ScriptNavigationResult(); }; #undef AFTER_EXTRA + /** + * @symbol ?SetUpScriptAssertHandler\@ScriptModuleMinecraft\@\@YAXXZ + */ + MCAPI void SetUpScriptAssertHandler(); /** * @symbol ?bindBlockLocation\@ScriptModuleMinecraft\@\@YA?AV?$ClassBindingBuilder\@VBlockPos\@\@\@Scripting\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ScriptModuleMinecraftServerUI.hpp b/LiteLoader/include/llapi/mc/ScriptModuleMinecraftServerUI.hpp new file mode 100644 index 0000000000..0a26a3a43c --- /dev/null +++ b/LiteLoader/include/llapi/mc/ScriptModuleMinecraftServerUI.hpp @@ -0,0 +1,25 @@ +/** + * @file ScriptModuleMinecraftServerUI.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Scripting.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace ScriptModuleMinecraftServerUI { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?bindScriptFormRejectReason\@ScriptModuleMinecraftServerUI\@\@YA?AV?$EnumBindingBuilder\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ScriptFormRejectReason\@ScriptModuleMinecraftServerUI\@\@\@Scripting\@\@XZ + */ + MCAPI class Scripting::EnumBindingBuilder bindScriptFormRejectReason(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ScriptModuleMinecraftUI.hpp b/LiteLoader/include/llapi/mc/ScriptModuleMinecraftUI.hpp deleted file mode 100644 index 93a3008e10..0000000000 --- a/LiteLoader/include/llapi/mc/ScriptModuleMinecraftUI.hpp +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file ScriptModuleMinecraftUI.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "Scripting.hpp" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -namespace ScriptModuleMinecraftUI { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA - /** - * @symbol ?bindScriptFormRejectReason\@ScriptModuleMinecraftUI\@\@YA?AV?$EnumBindingBuilder\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ScriptFormRejectReason\@ScriptModuleMinecraftUI\@\@\@Scripting\@\@XZ - */ - MCAPI class Scripting::EnumBindingBuilder bindScriptFormRejectReason(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ScriptPackConfiguration.hpp b/LiteLoader/include/llapi/mc/ScriptPackConfiguration.hpp index a41f49a941..4414a12d7a 100644 --- a/LiteLoader/include/llapi/mc/ScriptPackConfiguration.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPackConfiguration.hpp @@ -21,10 +21,6 @@ class ScriptPackConfiguration { #undef AFTER_EXTRA public: - /** - * @symbol ??0ScriptPackConfiguration\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI ScriptPackConfiguration(class ScriptPackConfiguration &&); /** * @symbol ??0ScriptPackConfiguration\@\@QEAA\@XZ */ @@ -33,6 +29,10 @@ 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 */ diff --git a/LiteLoader/include/llapi/mc/ScriptPackConfigurationManager.hpp b/LiteLoader/include/llapi/mc/ScriptPackConfigurationManager.hpp index 262a6a3576..39f4e45448 100644 --- a/LiteLoader/include/llapi/mc/ScriptPackConfigurationManager.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPackConfigurationManager.hpp @@ -26,14 +26,14 @@ class ScriptPackConfigurationManager { #endif public: - /** - * @symbol ??0ScriptPackConfigurationManager\@\@QEAA\@XZ - */ - MCAPI ScriptPackConfigurationManager(); /** * @symbol ??0ScriptPackConfigurationManager\@\@QEAA\@AEBV0\@\@Z */ MCAPI ScriptPackConfigurationManager(class ScriptPackConfigurationManager const &); + /** + * @symbol ??0ScriptPackConfigurationManager\@\@QEAA\@XZ + */ + MCAPI ScriptPackConfigurationManager(); /** * @symbol ?getPackConfiguration\@ScriptPackConfigurationManager\@\@QEBAAEBVScriptPackConfiguration\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ScriptPackPermissions.hpp b/LiteLoader/include/llapi/mc/ScriptPackPermissions.hpp index 096d6517f6..bbd6ef30a6 100644 --- a/LiteLoader/include/llapi/mc/ScriptPackPermissions.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPackPermissions.hpp @@ -19,6 +19,11 @@ class ScriptPackPermissions { #define AFTER_EXTRA #undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SCRIPTPACKPERMISSIONS +public: + class ScriptPackPermissions& operator=(class ScriptPackPermissions const &) = delete; +#endif + public: /** * @symbol ??0ScriptPackPermissions\@\@QEAA\@XZ @@ -28,10 +33,6 @@ class ScriptPackPermissions { * @symbol ??0ScriptPackPermissions\@\@QEAA\@AEBV0\@\@Z */ MCAPI ScriptPackPermissions(class ScriptPackPermissions const &); - /** - * @symbol ??4ScriptPackPermissions\@\@QEAAAEAV0\@AEBV0\@\@Z - */ - MCAPI class ScriptPackPermissions & operator=(class ScriptPackPermissions const &); //private: diff --git a/LiteLoader/include/llapi/mc/ScriptPlugin.hpp b/LiteLoader/include/llapi/mc/ScriptPlugin.hpp index cb42bb6a0d..f61d89c47e 100644 --- a/LiteLoader/include/llapi/mc/ScriptPlugin.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPlugin.hpp @@ -46,6 +46,14 @@ 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/ScriptPluginHandleCounter.hpp b/LiteLoader/include/llapi/mc/ScriptPluginHandleCounter.hpp index 8f6b395a18..93d81dee9d 100644 --- a/LiteLoader/include/llapi/mc/ScriptPluginHandleCounter.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPluginHandleCounter.hpp @@ -35,24 +35,24 @@ class ScriptPluginHandleCounter { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?onMakeObject\@ScriptPluginHandleCounter\@\@UEAAXAEAVLifetimeRegistry\@Scripting\@\@UObjectHandle\@3\@Vmeta_type\@entt\@\@I\@Z + * @symbol ?onMakeObject\@ScriptPluginHandleCounter\@\@UEAAXAEAVLifetimeRegistry\@Scripting\@\@UObjectHandle\@3\@AEBVmeta_type\@entt\@\@I\@Z */ - virtual void onMakeObject(class Scripting::LifetimeRegistry &, struct Scripting::ObjectHandle, class entt::meta_type, unsigned int); + virtual void onMakeObject(class Scripting::LifetimeRegistry &, struct Scripting::ObjectHandle, class entt::meta_type const &, unsigned int); /** * @vftbl 2 - * @symbol ?onDestroyObject\@ScriptPluginHandleCounter\@\@UEAAXAEAVLifetimeRegistry\@Scripting\@\@UObjectHandle\@3\@Vmeta_type\@entt\@\@I\@Z + * @symbol ?onDestroyObject\@ScriptPluginHandleCounter\@\@UEAAXAEAVLifetimeRegistry\@Scripting\@\@UObjectHandle\@3\@AEBVmeta_type\@entt\@\@I\@Z */ - virtual void onDestroyObject(class Scripting::LifetimeRegistry &, struct Scripting::ObjectHandle, class entt::meta_type, unsigned int); + virtual void onDestroyObject(class Scripting::LifetimeRegistry &, struct Scripting::ObjectHandle, class entt::meta_type const &, unsigned int); /** * @vftbl 3 - * @symbol ?onTrackObject\@ScriptPluginHandleCounter\@\@UEAAXAEAVLifetimeRegistry\@Scripting\@\@UObjectHandle\@3\@Vmeta_type\@entt\@\@I\@Z + * @symbol ?onTrackObject\@ScriptPluginHandleCounter\@\@UEAAXAEAVLifetimeRegistry\@Scripting\@\@UObjectHandle\@3\@AEBVmeta_type\@entt\@\@I\@Z */ - virtual void onTrackObject(class Scripting::LifetimeRegistry &, struct Scripting::ObjectHandle, class entt::meta_type, unsigned int); + virtual void onTrackObject(class Scripting::LifetimeRegistry &, struct Scripting::ObjectHandle, class entt::meta_type const &, unsigned int); /** * @vftbl 4 - * @symbol ?onUntrackObject\@ScriptPluginHandleCounter\@\@UEAAXAEAVLifetimeRegistry\@Scripting\@\@UObjectHandle\@3\@Vmeta_type\@entt\@\@I\@Z + * @symbol ?onUntrackObject\@ScriptPluginHandleCounter\@\@UEAAXAEAVLifetimeRegistry\@Scripting\@\@UObjectHandle\@3\@AEBVmeta_type\@entt\@\@I\@Z */ - virtual void onUntrackObject(class Scripting::LifetimeRegistry &, struct Scripting::ObjectHandle, class entt::meta_type, unsigned int); + virtual void onUntrackObject(class Scripting::LifetimeRegistry &, struct Scripting::ObjectHandle, class entt::meta_type const &, unsigned int); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCRIPTPLUGINHANDLECOUNTER /** * @symbol ?onObjectPromotedToMultipleOwners\@ScriptPluginHandleCounter\@\@UEAAXAEAVLifetimeRegistry\@Scripting\@\@UObjectHandle\@3\@\@Z @@ -74,9 +74,9 @@ class ScriptPluginHandleCounter { //private: /** - * @symbol ?_getOrMakeStats\@ScriptPluginHandleCounter\@\@AEAAPEAUTypeStats\@1\@Vmeta_type\@entt\@\@\@Z + * @symbol ?_getOrMakeStats\@ScriptPluginHandleCounter\@\@AEAAPEAUTypeStats\@1\@AEBVmeta_type\@entt\@\@\@Z */ - MCAPI struct ScriptPluginHandleCounter::TypeStats * _getOrMakeStats(class entt::meta_type); + MCAPI struct ScriptPluginHandleCounter::TypeStats * _getOrMakeStats(class entt::meta_type const &); private: diff --git a/LiteLoader/include/llapi/mc/ScriptPluginHandleStats.hpp b/LiteLoader/include/llapi/mc/ScriptPluginHandleStats.hpp index 9d1e682cd1..16dd79f862 100644 --- a/LiteLoader/include/llapi/mc/ScriptPluginHandleStats.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPluginHandleStats.hpp @@ -26,14 +26,14 @@ struct ScriptPluginHandleStats { #endif public: - /** - * @symbol ??4ScriptPluginHandleStats\@\@QEAAAEAU0\@$$QEAU0\@\@Z - */ - MCAPI struct ScriptPluginHandleStats & operator=(struct ScriptPluginHandleStats &&); /** * @symbol ??4ScriptPluginHandleStats\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct ScriptPluginHandleStats & operator=(struct ScriptPluginHandleStats const &); + /** + * @symbol ??4ScriptPluginHandleStats\@\@QEAAAEAU0\@$$QEAU0\@\@Z + */ + MCAPI struct ScriptPluginHandleStats & operator=(struct ScriptPluginHandleStats &&); /** * @symbol ??1ScriptPluginHandleStats\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ScriptPluginManager.hpp b/LiteLoader/include/llapi/mc/ScriptPluginManager.hpp index 49d195f439..6cc51e3628 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 "ResourceInformation.hpp" #include "Scripting.hpp" +#include "ResourceInformation.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,6 +31,10 @@ 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 */ @@ -39,6 +43,14 @@ 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 */ @@ -47,6 +59,10 @@ 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 eef5fc3ccd..e09c136146 100644 --- a/LiteLoader/include/llapi/mc/ScriptPluginPackSourceEnumerator.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPluginPackSourceEnumerator.hpp @@ -43,5 +43,9 @@ 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/ScriptPrintLogger.hpp b/LiteLoader/include/llapi/mc/ScriptPrintLogger.hpp index bd2d213dd5..d722a361ff 100644 --- a/LiteLoader/include/llapi/mc/ScriptPrintLogger.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPrintLogger.hpp @@ -57,8 +57,13 @@ class ScriptPrintLogger { virtual void onException(struct Scripting::ContextId, class entt::meta_any const &) const; /** * @vftbl 5 - * @symbol ?shouldPrintException\@ScriptPrintLogger\@\@UEBA_NAEBVmeta_any\@entt\@\@\@Z + * @symbol ?shouldPrintException\@ScriptPrintLogger\@\@UEBA_NUContextId\@Scripting\@\@AEBVmeta_any\@entt\@\@\@Z */ - virtual bool shouldPrintException(class entt::meta_any const &) const; + virtual bool shouldPrintException(struct Scripting::ContextId, class entt::meta_any const &) const; + /** + * @vftbl 6 + * @symbol ?onPromiseRejection\@ScriptPrintLogger\@\@UEBAXUContextId\@Scripting\@\@AEBV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@_N\@Z + */ + virtual void onPromiseRejection(struct Scripting::ContextId, class std::basic_string_view> const &, bool) const; }; diff --git a/LiteLoader/include/llapi/mc/ScriptTickListener.hpp b/LiteLoader/include/llapi/mc/ScriptTickListener.hpp index ff1ff34d28..6b84eed04a 100644 --- a/LiteLoader/include/llapi/mc/ScriptTickListener.hpp +++ b/LiteLoader/include/llapi/mc/ScriptTickListener.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Scripting.hpp" #define BEFORE_EXTRA @@ -37,5 +38,9 @@ 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/SculkBlock.hpp b/LiteLoader/include/llapi/mc/SculkBlock.hpp index c298dfd627..314335daf7 100644 --- a/LiteLoader/include/llapi/mc/SculkBlock.hpp +++ b/LiteLoader/include/llapi/mc/SculkBlock.hpp @@ -40,16 +40,21 @@ class SculkBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class SculkBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class SculkBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,112 +131,107 @@ class SculkBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@SculkBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @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 7685322cae..4925391e73 100644 --- a/LiteLoader/include/llapi/mc/SculkCatalystBlock.hpp +++ b/LiteLoader/include/llapi/mc/SculkCatalystBlock.hpp @@ -40,16 +40,21 @@ class SculkCatalystBlock : public ActorBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class SculkCatalystBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class SculkCatalystBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,127 +131,122 @@ class SculkCatalystBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@SculkCatalystBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@SculkCatalystBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@SculkCatalystBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@SculkCatalystBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @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 52e79e474d..f74d6a0b4a 100644 --- a/LiteLoader/include/llapi/mc/SculkSensorBlock.hpp +++ b/LiteLoader/include/llapi/mc/SculkSensorBlock.hpp @@ -50,16 +50,21 @@ class SculkSensorBlock : public ActorBlock { * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -71,10 +76,10 @@ class SculkSensorBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +111,10 @@ class SculkSensorBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,167 +141,162 @@ class SculkSensorBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 51 + * @vftbl 50 * @symbol ?isSignalSource\@SculkSensorBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 64 + * @vftbl 63 * @symbol ?shouldConnectToRedstone\@SculkSensorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@SculkSensorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 + */ + virtual void __unk_vfn_81(); + /** + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 127 + * @vftbl 125 * @symbol ?getComparatorSignal\@SculkSensorBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@SculkSensorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 154 + * @vftbl 152 * @symbol ?getLightEmission\@SculkSensorBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 165 + * @vftbl 163 * @symbol ?onStandOn\@SculkSensorBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ virtual void onStandOn(class EntityContext &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@SculkSensorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@SculkSensorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 185 + * @vftbl 184 * @symbol ?getEmissiveBrightness\@SculkSensorBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getEmissiveBrightness(class Block const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@SculkSensorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@SculkSensorBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@SculkSensorBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; @@ -315,16 +315,20 @@ class SculkSensorBlock : public ActorBlock { */ MCAPI SculkSensorBlock(std::string const &, int); /** - * @symbol ??0SculkSensorBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4BlockActorType\@\@\@Z - */ - MCAPI SculkSensorBlock(std::string const &, int, enum class BlockActorType); - /** - * @symbol ?activate\@SculkSensorBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@HH\@Z + * @symbol ??0SculkSensorBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4BlockActorType\@\@H\@Z */ - MCAPI static void activate(class BlockSource &, class BlockPos const &, class Actor *, int, int); + MCAPI SculkSensorBlock(std::string const &, int, enum class BlockActorType, int); /** * @symbol ?isActive\@SculkSensorBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool isActive(class BlockSource &, class BlockPos const &); + /** + * @symbol ?isOnCooldown\@SculkSensorBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI static bool isOnCooldown(class BlockSource &, class BlockPos const &); + /** + * @symbol ?setActivePhase\@SculkSensorBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@HH\@Z + */ + MCAPI static void setActivePhase(class BlockSource &, class BlockPos const &, class Actor *, int, int); }; diff --git a/LiteLoader/include/llapi/mc/SculkSensorBlockActor.hpp b/LiteLoader/include/llapi/mc/SculkSensorBlockActor.hpp index be791806a0..b740fb4ac6 100644 --- a/LiteLoader/include/llapi/mc/SculkSensorBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/SculkSensorBlockActor.hpp @@ -91,24 +91,24 @@ class SculkSensorBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCULKSENSORBLOCKACTOR /** * @symbol __unk_destructor_-1 */ MCVAPI ~SculkSensorBlockActor(); #endif - /** - * @symbol ??0SculkSensorBlockActor\@\@QEAA\@W4BlockActorType\@\@AEBVBlockPos\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV?$unique_ptr\@VSculkSensorVibrationConfig\@\@U?$default_delete\@VSculkSensorVibrationConfig\@\@\@std\@\@\@4\@\@Z - */ - MCAPI SculkSensorBlockActor(enum class BlockActorType, class BlockPos const &, std::string const &, std::unique_ptr &&); /** * @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 ?getLatestReceivedVibrationFrequency\@SculkSensorBlockActor\@\@QEBAHXZ */ diff --git a/LiteLoader/include/llapi/mc/SculkSensorBlockActorConstants.hpp b/LiteLoader/include/llapi/mc/SculkSensorBlockActorConstants.hpp new file mode 100644 index 0000000000..c756ef02f8 --- /dev/null +++ b/LiteLoader/include/llapi/mc/SculkSensorBlockActorConstants.hpp @@ -0,0 +1,24 @@ +/** + * @file SculkSensorBlockActorConstants.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace SculkSensorBlockActorConstants { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?VibrationListenerTag\@SculkSensorBlockActorConstants\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI extern std::string const VibrationListenerTag; + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SculkSensorConversionUtils.hpp b/LiteLoader/include/llapi/mc/SculkSensorConversionUtils.hpp new file mode 100644 index 0000000000..49af78208e --- /dev/null +++ b/LiteLoader/include/llapi/mc/SculkSensorConversionUtils.hpp @@ -0,0 +1,28 @@ +/** + * @file SculkSensorConversionUtils.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace SculkSensorConversionUtils { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?SculkSensorPhaseStateGetter\@SculkSensorConversionUtils\@\@3V?$function\@$$A6A?AV?$optional\@H\@std\@\@AEBVBlockLegacy\@\@H\@Z\@std\@\@A + */ + MCAPI extern class std::function (class BlockLegacy const &, int)> SculkSensorPhaseStateGetter; + /** + * @symbol ?SculkSensorPhaseStateSetter\@SculkSensorConversionUtils\@\@3V?$function\@$$A6APEBVBlock\@\@AEBVBlockLegacy\@\@HH\@Z\@std\@\@A + */ + MCAPI extern class std::function SculkSensorPhaseStateSetter; + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SculkSensorVibrationConfig.hpp b/LiteLoader/include/llapi/mc/SculkSensorVibrationConfig.hpp index 32eac75bbd..8b2771de76 100644 --- a/LiteLoader/include/llapi/mc/SculkSensorVibrationConfig.hpp +++ b/LiteLoader/include/llapi/mc/SculkSensorVibrationConfig.hpp @@ -35,9 +35,9 @@ class SculkSensorVibrationConfig : public VibrationListenerConfig { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?onSignalReceive\@SculkSensorVibrationConfig\@\@UEAAXAEAVBlockSource\@\@VBlockPos\@\@AEBVGameEvent\@\@PEAVActor\@\@M3\@Z + * @symbol ?onSignalReceive\@SculkSensorVibrationConfig\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVGameEvent\@\@PEAVActor\@\@MI3\@Z */ - virtual void onSignalReceive(class BlockSource &, class BlockPos, class GameEvent const &, class Actor *, float, class Actor *); + virtual void onSignalReceive(class BlockSource &, class BlockPos const &, class GameEvent const &, class Actor *, float, unsigned int, class Actor *); /** * @vftbl 2 * @symbol ?isValidVibration\@VibrationListenerConfig\@\@UEAA_NAEBVGameEvent\@\@\@Z @@ -48,6 +48,11 @@ class SculkSensorVibrationConfig : public VibrationListenerConfig { * @symbol ?shouldListen\@SculkSensorVibrationConfig\@\@UEAA_NAEAVBlockSource\@\@AEBVGameEvent\@\@AEBUGameEventContext\@\@\@Z */ virtual bool shouldListen(class BlockSource &, class GameEvent const &, struct GameEventContext const &); + /** + * @vftbl 4 + * @symbol ?onSerializableDataChanged\@SculkSensorVibrationConfig\@\@UEAAXAEAVBlockSource\@\@\@Z + */ + virtual void onSerializableDataChanged(class BlockSource &); /** * @symbol ??0SculkSensorVibrationConfig\@\@QEAA\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SculkShriekerBlock.hpp b/LiteLoader/include/llapi/mc/SculkShriekerBlock.hpp index bc17fc4c5c..2b5aaa4902 100644 --- a/LiteLoader/include/llapi/mc/SculkShriekerBlock.hpp +++ b/LiteLoader/include/llapi/mc/SculkShriekerBlock.hpp @@ -45,16 +45,21 @@ class SculkShriekerBlock : public ActorBlock { * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class SculkShriekerBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class SculkShriekerBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,152 +136,147 @@ class SculkShriekerBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@SculkShriekerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@SculkShriekerBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 153 + * @vftbl 151 * @symbol ?init\@SculkShriekerBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@SculkShriekerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 165 + * @vftbl 163 * @symbol ?onStandOn\@SculkShriekerBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ virtual void onStandOn(class EntityContext &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@SculkShriekerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@SculkShriekerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@SculkShriekerBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@SculkShriekerBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @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 f822f9d54c..8360263d5b 100644 --- a/LiteLoader/include/llapi/mc/SculkShriekerBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/SculkShriekerBlockActor.hpp @@ -89,10 +89,10 @@ class SculkShriekerBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); /** * @symbol ??0SculkShriekerBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SculkShriekerVibrationConfig.hpp b/LiteLoader/include/llapi/mc/SculkShriekerVibrationConfig.hpp index 0bd7e7e355..c6dde5352f 100644 --- a/LiteLoader/include/llapi/mc/SculkShriekerVibrationConfig.hpp +++ b/LiteLoader/include/llapi/mc/SculkShriekerVibrationConfig.hpp @@ -34,9 +34,9 @@ class SculkShriekerVibrationConfig { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?onSignalReceive\@SculkShriekerVibrationConfig\@\@UEAAXAEAVBlockSource\@\@VBlockPos\@\@AEBVGameEvent\@\@PEAVActor\@\@M3\@Z + * @symbol ?onSignalReceive\@SculkShriekerVibrationConfig\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVGameEvent\@\@PEAVActor\@\@MI3\@Z */ - virtual void onSignalReceive(class BlockSource &, class BlockPos, class GameEvent const &, class Actor *, float, class Actor *); + virtual void onSignalReceive(class BlockSource &, class BlockPos const &, class GameEvent const &, class Actor *, float, unsigned int, class Actor *); /** * @vftbl 2 * @symbol ?isValidVibration\@SculkShriekerVibrationConfig\@\@UEAA_NAEBVGameEvent\@\@\@Z @@ -47,5 +47,10 @@ class SculkShriekerVibrationConfig { * @symbol ?shouldListen\@SculkShriekerVibrationConfig\@\@UEAA_NAEAVBlockSource\@\@AEBVGameEvent\@\@AEBUGameEventContext\@\@\@Z */ virtual bool shouldListen(class BlockSource &, class GameEvent const &, struct GameEventContext const &); + /** + * @vftbl 4 + * @symbol ?onSerializableDataChanged\@SculkShriekerVibrationConfig\@\@UEAAXAEAVBlockSource\@\@\@Z + */ + virtual void onSerializableDataChanged(class BlockSource &); }; diff --git a/LiteLoader/include/llapi/mc/SculkVeinBlock.hpp b/LiteLoader/include/llapi/mc/SculkVeinBlock.hpp index f410d583a5..f019a7281a 100644 --- a/LiteLoader/include/llapi/mc/SculkVeinBlock.hpp +++ b/LiteLoader/include/llapi/mc/SculkVeinBlock.hpp @@ -40,16 +40,21 @@ class SculkVeinBlock : public MultifaceBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class SculkVeinBlock : public MultifaceBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class SculkVeinBlock : public MultifaceBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,137 +131,132 @@ class SculkVeinBlock : public MultifaceBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 69 + * @vftbl 68 * @symbol ?checkIsPathable\@SculkVeinBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@SculkVeinBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@SculkVeinBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@SculkVeinBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@SculkVeinBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 195 + * @vftbl 194 * @symbol ?getMultifaceBlock\@SculkVeinBlock\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getMultifaceBlock() const; /** - * @vftbl 196 + * @vftbl 195 * @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 91315fd6fa..f40188691e 100644 --- a/LiteLoader/include/llapi/mc/SeaLanternBlock.hpp +++ b/LiteLoader/include/llapi/mc/SeaLanternBlock.hpp @@ -40,16 +40,21 @@ class SeaLanternBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class SeaLanternBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class SeaLanternBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,112 +131,107 @@ class SeaLanternBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@SeaLanternBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@SeaLanternBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/SeaPickle.hpp b/LiteLoader/include/llapi/mc/SeaPickleBlock.hpp similarity index 52% rename from LiteLoader/include/llapi/mc/SeaPickle.hpp rename to LiteLoader/include/llapi/mc/SeaPickleBlock.hpp index e8cb40681a..a9cbbddb6b 100644 --- a/LiteLoader/include/llapi/mc/SeaPickle.hpp +++ b/LiteLoader/include/llapi/mc/SeaPickleBlock.hpp @@ -1,32 +1,27 @@ /** - * @file SeaPickle.hpp + * @file SeaPickleBlock.hpp * */ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "BlockLegacy.hpp" +#include "BushBlock.hpp" #define BEFORE_EXTRA -// Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC class SeaPickle. - * - */ -class SeaPickle : public BlockLegacy { + +class SeaPickleBlock : public BushBlock { #define AFTER_EXTRA -// Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SEAPICKLE +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SEAPICKLEBLOCK public: - class SeaPickle& operator=(class SeaPickle const &) = delete; - SeaPickle(class SeaPickle const &) = delete; - SeaPickle() = delete; + class SeaPickleBlock& operator=(class SeaPickleBlock const &) = delete; + SeaPickleBlock(class SeaPickleBlock const &) = delete; + SeaPickleBlock() = delete; #endif public: @@ -37,7 +32,7 @@ class SeaPickle : public BlockLegacy { virtual void __unk_vfn_0(); /** * @vftbl 10 - * @symbol ?getAABB\@SeaPickle\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @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; /** @@ -47,19 +42,24 @@ class SeaPickle : public BlockLegacy { virtual void __unk_vfn_19(); /** * @vftbl 22 - * @symbol ?canProvideSupport\@SeaPickle\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -71,10 +71,10 @@ class SeaPickle : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +106,10 @@ class SeaPickle : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,15 +136,15 @@ class SeaPickle : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -152,191 +152,186 @@ class SeaPickle : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 - * @symbol ?canContainLiquid\@SeaPickle\@\@UEBA_NXZ + * @symbol ?canContainLiquid\@SeaPickleBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 - * @symbol ?onFertilized\@SeaPickle\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 85 + * @symbol ?onFertilized\@SeaPickleBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 - * @symbol ?mayConsumeFertilizer\@SeaPickle\@\@UEBA_NAEAVBlockSource\@\@\@Z + * @vftbl 86 + * @symbol ?mayConsumeFertilizer\@SeaPickleBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 88 - * @symbol ?canBeFertilized\@SeaPickle\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 87 + * @symbol ?canBeFertilized\@SeaPickleBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 93 - * @symbol ?mayPlaceOn\@SeaPickle\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlaceOn\@SeaPickleBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@SeaPickle\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 98 + * @symbol ?neighborChanged\@SeaPickleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 - * @symbol ?buildDescriptionId\@SeaPickle\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @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 136 - * @symbol ?getColor\@SeaPickle\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 134 + * @symbol ?getColor\@SeaPickleBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 137 - * @symbol ?getColor\@SeaPickle\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 135 + * @symbol ?getColor\@SeaPickleBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 154 - * @symbol ?getLightEmission\@SeaPickle\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z + * @vftbl 152 + * @symbol ?getLightEmission\@SeaPickleBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 - * @symbol ?onPlace\@SeaPickle\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 167 + * @symbol ?onPlace\@SeaPickleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 - * @symbol ?tick\@SeaPickle\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 170 + * @symbol ?tick\@SeaPickleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol ?randomTick\@SeaPickle\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?randomTick\@SeaPickleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 - * @symbol ?canSurvive\@SeaPickle\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol ?canSurvive\@SeaPickleBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 - * @symbol ?playerDestroy\@SeaPickle\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 187 + * @symbol ?playerDestroy\@SeaPickleBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 - * @symbol ?getResourceItem\@SeaPickle\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@SeaPickleBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 195 - * @symbol ?checkAlive\@SeaPickle\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 194 + * @symbol ?checkAlive\@SeaPickleBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void checkAlive(class BlockSource &, class BlockPos const &) const; -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SEAPICKLE +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SEAPICKLEBLOCK /** - * @symbol ?canBeSilkTouched\@SeaPickle\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@SeaPickleBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?hasVariableLighting\@SeaPickle\@\@UEBA_NXZ + * @symbol ?hasVariableLighting\@SeaPickleBlock\@\@UEBA_NXZ */ MCVAPI bool hasVariableLighting() const; /** - * @symbol ?waterSpreadCausesSpawn\@SeaPickle\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@SeaPickleBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0SeaPickle\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0SeaPickleBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ - MCAPI SeaPickle(std::string const &, int); + MCAPI SeaPickleBlock(std::string const &, int); }; diff --git a/LiteLoader/include/llapi/mc/SeaPickleBlockItem.hpp b/LiteLoader/include/llapi/mc/SeaPickleBlockItem.hpp index bef45ae1ea..c2971f18af 100644 --- a/LiteLoader/include/llapi/mc/SeaPickleBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/SeaPickleBlockItem.hpp @@ -36,11 +36,6 @@ class SeaPickleBlockItem : public BlockItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class SeaPickleBlockItem : public BlockItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 45 * @symbol ?getLevelDataForAuxValue\@SeaPickleBlockItem\@\@UEBAHH\@Z @@ -107,7 +107,17 @@ class SeaPickleBlockItem : public BlockItem { */ virtual void __unk_vfn_80(); /** - * @vftbl 132 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 134 * @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/SeaGrass.hpp b/LiteLoader/include/llapi/mc/SeagrassBlock.hpp similarity index 52% rename from LiteLoader/include/llapi/mc/SeaGrass.hpp rename to LiteLoader/include/llapi/mc/SeagrassBlock.hpp index d7749364de..0b6549b5a8 100644 --- a/LiteLoader/include/llapi/mc/SeaGrass.hpp +++ b/LiteLoader/include/llapi/mc/SeagrassBlock.hpp @@ -1,5 +1,5 @@ /** - * @file SeaGrass.hpp + * @file SeagrassBlock.hpp * */ #pragma once @@ -8,25 +8,20 @@ #include "BlockLegacy.hpp" #define BEFORE_EXTRA -// Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC class SeaGrass. - * - */ -class SeaGrass : public BlockLegacy { + +class SeagrassBlock : public BlockLegacy { #define AFTER_EXTRA -// Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SEAGRASS +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SEAGRASSBLOCK public: - class SeaGrass& operator=(class SeaGrass const &) = delete; - SeaGrass(class SeaGrass const &) = delete; - SeaGrass() = delete; + class SeagrassBlock& operator=(class SeagrassBlock const &) = delete; + SeagrassBlock(class SeagrassBlock const &) = delete; + SeagrassBlock() = delete; #endif public: @@ -37,12 +32,12 @@ class SeaGrass : public BlockLegacy { virtual void __unk_vfn_0(); /** * @vftbl 8 - * @symbol ?randomlyModifyPosition\@SeaGrass\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z + * @symbol ?randomlyModifyPosition\@SeagrassBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** * @vftbl 10 - * @symbol ?getAABB\@SeaGrass\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @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; /** @@ -50,16 +45,21 @@ class SeaGrass : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -71,10 +71,10 @@ class SeaGrass : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +106,10 @@ class SeaGrass : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,191 +136,186 @@ class SeaGrass : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** * @vftbl 54 - * @symbol __unk_vfn_54 + * @symbol ?isValidAuxValue\@SeagrassBlock\@\@UEBA_NH\@Z */ - virtual void __unk_vfn_54(); + virtual bool isValidAuxValue(int) const; /** - * @vftbl 55 - * @symbol ?isValidAuxValue\@SeaGrass\@\@UEBA_NH\@Z + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual bool isValidAuxValue(int) const; + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 86 - * @symbol ?onFertilized\@SeaGrass\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 85 + * @symbol ?onFertilized\@SeagrassBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 - * @symbol ?mayConsumeFertilizer\@SeaGrass\@\@UEBA_NAEAVBlockSource\@\@\@Z + * @vftbl 86 + * @symbol ?mayConsumeFertilizer\@SeagrassBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 88 - * @symbol ?canBeFertilized\@SeaGrass\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 87 + * @symbol ?canBeFertilized\@SeagrassBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 - * @symbol ?mayPlace\@SeaGrass\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 91 + * @symbol ?mayPlace\@SeagrassBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@SeaGrass\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 98 + * @symbol ?neighborChanged\@SeagrassBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 - * @symbol ?buildDescriptionId\@SeaGrass\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @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 136 - * @symbol ?getColor\@SeaGrass\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 134 + * @symbol ?getColor\@SeagrassBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 137 - * @symbol ?getColor\@SeaGrass\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 135 + * @symbol ?getColor\@SeagrassBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 - * @symbol ?onPlace\@SeaGrass\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 167 + * @symbol ?onPlace\@SeagrassBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 - * @symbol ?tick\@SeaGrass\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 170 + * @symbol ?tick\@SeagrassBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 - * @symbol ?canSurvive\@SeaGrass\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol ?canSurvive\@SeagrassBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 - * @symbol ?playerDestroy\@SeaGrass\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 187 + * @symbol ?playerDestroy\@SeagrassBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 190 - * @symbol ?getResourceCount\@SeaGrass\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@SeagrassBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SEAGRASS +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SEAGRASSBLOCK /** - * @symbol ?canBeSilkTouched\@SeaGrass\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@SeagrassBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?waterSpreadCausesSpawn\@SeaGrass\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@SeagrassBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0SeaGrass\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0SeagrassBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ - MCAPI SeaGrass(std::string const &, int); + MCAPI SeagrassBlock(std::string const &, int); /** - * @symbol ?trySpawnSeaGrass\@SeaGrass\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?trySpawnSeaGrass\@SeagrassBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool trySpawnSeaGrass(class BlockSource &, class BlockPos const &); diff --git a/LiteLoader/include/llapi/mc/SeatDescriptionUtility.hpp b/LiteLoader/include/llapi/mc/SeatDescriptionUtility.hpp index a3aaaa28ef..84821930a1 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\@\@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 ?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 ?getSeatRidingHeightOffset\@SeatDescriptionUtility\@\@SAMMMM\@Z */ diff --git a/LiteLoader/include/llapi/mc/SendPlayerAuthInputReceivedEventSystem.hpp b/LiteLoader/include/llapi/mc/SendPlayerAuthInputReceivedEventSystem.hpp new file mode 100644 index 0000000000..4724ea2645 --- /dev/null +++ b/LiteLoader/include/llapi/mc/SendPlayerAuthInputReceivedEventSystem.hpp @@ -0,0 +1,36 @@ +/** + * @file SendPlayerAuthInputReceivedEventSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class SendPlayerAuthInputReceivedEventSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SENDPLAYERAUTHINPUTRECEIVEDEVENTSYSTEM +public: + class SendPlayerAuthInputReceivedEventSystem& operator=(class SendPlayerAuthInputReceivedEventSystem const &) = delete; + SendPlayerAuthInputReceivedEventSystem(class SendPlayerAuthInputReceivedEventSystem const &) = delete; + SendPlayerAuthInputReceivedEventSystem() = delete; +#endif + +public: + /** + * @symbol ?_doSendPlayerAuthInputReceivedEvent\@SendPlayerAuthInputReceivedEventSystem\@\@SAXAEAVStrictEntityContext\@\@AEBV?$FlagComponent\@UPlayerComponentFlag\@\@\@\@AEAVActorOwnerComponent\@\@\@Z + */ + MCAPI static void _doSendPlayerAuthInputReceivedEvent(class StrictEntityContext &, class FlagComponent const &, class ActorOwnerComponent &); + /** + * @symbol ?create\@SendPlayerAuthInputReceivedEventSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo create(); + +}; diff --git a/LiteLoader/include/llapi/mc/SerializerContext.hpp b/LiteLoader/include/llapi/mc/SerializerContext.hpp index 54d62fa47d..ccf66d5d6d 100644 --- a/LiteLoader/include/llapi/mc/SerializerContext.hpp +++ b/LiteLoader/include/llapi/mc/SerializerContext.hpp @@ -51,6 +51,10 @@ class SerializerContext { * @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 */ diff --git a/LiteLoader/include/llapi/mc/ServerAutoStepSystem.hpp b/LiteLoader/include/llapi/mc/ServerAutoStepSystem.hpp index 47127f32b6..4ea74af356 100644 --- a/LiteLoader/include/llapi/mc/ServerAutoStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/ServerAutoStepSystem.hpp @@ -49,9 +49,9 @@ class ServerAutoStepSystem { 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\@\@UPlayerGameTypeComponent\@\@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\@ULocalConstBlockSourceFactoryComponent\@\@ULocalSpatialEntityFetcherFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @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<>> &); + 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 */ diff --git a/LiteLoader/include/llapi/mc/ServerCommand.hpp b/LiteLoader/include/llapi/mc/ServerCommand.hpp index 7ab19f962a..810832ffe7 100644 --- a/LiteLoader/include/llapi/mc/ServerCommand.hpp +++ b/LiteLoader/include/llapi/mc/ServerCommand.hpp @@ -36,9 +36,9 @@ class ServerCommand { //protected: /** - * @symbol ?tryToSIFTText\@ServerCommand\@\@IEBA_NAEBVCommandOrigin\@\@AEAVCommandOutput\@\@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\@\@AEBW4TextProcessingEventOrigin\@\@V?$function\@$$A6AXAEBV?$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\@Z\@5\@\@Z + * @symbol ?tryToSIFTText\@ServerCommand\@\@IEBA_NAEBVCommandOrigin\@\@AEAVCommandOutput\@\@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\@\@AEBW4TextProcessingEventOrigin\@\@V?$function\@$$A6AXAEBV?$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\@\@AEBV?$vector\@W4TextFilteringEvent\@Safety\@\@V?$allocator\@W4TextFilteringEvent\@Safety\@\@\@std\@\@\@2\@\@Z\@5\@\@Z */ - MCAPI bool tryToSIFTText(class CommandOrigin const &, class CommandOutput &, std::vector const &, enum class TextProcessingEventOrigin const &, class std::function const &, std::vector const &)>) const; + MCAPI bool tryToSIFTText(class CommandOrigin const &, class CommandOutput &, std::vector const &, enum class TextProcessingEventOrigin const &, class std::function const &, std::vector const &)>) const; protected: /** diff --git a/LiteLoader/include/llapi/mc/ServerInstance.hpp b/LiteLoader/include/llapi/mc/ServerInstance.hpp index 25c311e022..05bc4c50b4 100644 --- a/LiteLoader/include/llapi/mc/ServerInstance.hpp +++ b/LiteLoader/include/llapi/mc/ServerInstance.hpp @@ -120,9 +120,9 @@ 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\@\@W4TransportLayer\@\@7MV?$optional\@_N\@9\@W4ForceBlockNetworkIdsAreHashes\@\@AEBUNetworkPermissions\@\@\@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?$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 */ - 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 &, enum class TransportLayer, bool, float, class std::optional, enum class ForceBlockNetworkIdsAreHashes, struct NetworkPermissions const &); + 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>); /** * @symbol ?leaveGameSync\@ServerInstance\@\@QEAAXXZ */ @@ -153,6 +153,10 @@ class ServerInstance { MCAPI static class std::chrono::duration<__int64, struct std::ratio<1, 1000000000>> const SERVER_MAX_DELAY_BEFORE_SLOWDOWN; //private: + /** + * @symbol ?_resetServerScriptManager\@ServerInstance\@\@AEAAXXZ + */ + MCAPI void _resetServerScriptManager(); /** * @symbol ?_threadSafeExecute\@ServerInstance\@\@AEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ServerLevel.hpp b/LiteLoader/include/llapi/mc/ServerLevel.hpp index 91482b8987..b11e111e64 100644 --- a/LiteLoader/include/llapi/mc/ServerLevel.hpp +++ b/LiteLoader/include/llapi/mc/ServerLevel.hpp @@ -32,13 +32,13 @@ class ServerLevel { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SERVERLEVEL /** - * @symbol ?_subTick\@ServerLevel\@\@MEAAXXZ + * @symbol ?_getPlayerDeathManager\@ServerLevel\@\@MEAAPEAVPlayerDeathManager\@\@XZ */ - MCVAPI void _subTick(); + MCVAPI class PlayerDeathManager * _getPlayerDeathManager(); /** - * @symbol ?consolidateLevelChunkMetaData\@ServerLevel\@\@UEAAXAEAVLevelChunk\@\@\@Z + * @symbol ?_subTick\@ServerLevel\@\@MEAAXXZ */ - MCVAPI void consolidateLevelChunkMetaData(class LevelChunk &); + MCVAPI void _subTick(); /** * @symbol ?decrementTagCache\@ServerLevel\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$TagRegistry\@U?$IDType\@ULevelTagIDType\@\@\@\@U?$IDType\@ULevelTagSetIDType\@\@\@\@\@\@\@Z */ @@ -48,9 +48,9 @@ class ServerLevel { */ MCVAPI class ResourcePackManager * getClientResourcePackManager() const; /** - * @symbol ?getLevelChunkMetaDataDictionary\@ServerLevel\@\@UEBA?AV?$shared_ptr\@VLevelChunkMetaDataDictionary\@\@\@std\@\@XZ + * @symbol ?getLevelChunkMetaDataManager\@ServerLevel\@\@UEAAPEAVLevelChunkMetaDataManager\@\@XZ */ - MCVAPI class std::shared_ptr getLevelChunkMetaDataDictionary() const; + MCVAPI class LevelChunkMetaDataManager * getLevelChunkMetaDataManager(); /** * @symbol ?getLevelEventCoordinator\@ServerLevel\@\@UEAAAEAVLevelEventCoordinator\@\@XZ */ @@ -87,10 +87,6 @@ class ServerLevel { * @symbol ?initialize\@ServerLevel\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVLevelSettings\@\@PEAVLevelData\@\@AEBVExperiments\@\@PEBV23\@\@Z */ MCVAPI bool initialize(std::string const &, class LevelSettings const &, class LevelData *, class Experiments const &, std::string const *); - /** - * @symbol ?initializeLevelChunkMetaData\@ServerLevel\@\@UEAAXAEAVLevelChunk\@\@\@Z - */ - MCVAPI void initializeLevelChunkMetaData(class LevelChunk &); /** * @symbol ?loadFunctionManager\@ServerLevel\@\@UEAAXXZ */ @@ -115,10 +111,6 @@ class ServerLevel { * @symbol ?saveAdditionalData\@ServerLevel\@\@UEAAXXZ */ MCVAPI void saveAdditionalData(); - /** - * @symbol ?saveDynamicProperties\@ServerLevel\@\@UEAAXXZ - */ - MCVAPI void saveDynamicProperties(); /** * @symbol ?setCommandsEnabled\@ServerLevel\@\@UEAAX_N\@Z */ @@ -137,9 +129,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_NV?$weak_ptr\@VBlockTypeRegistry\@\@\@4\@\@Z + * @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 */ - 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, class std::weak_ptr); + 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); /** * @symbol ?addServerChunksToPacket\@ServerLevel\@\@QEAAXAEBVNetworkIdentifier\@\@W4SubClientId\@\@AEAVNetworkChunkPublisherUpdatePacket\@\@\@Z */ @@ -198,6 +190,10 @@ class ServerLevel { * @symbol ?_initializeActorManager\@ServerLevel\@\@AEAAXXZ */ MCAPI void _initializeActorManager(); + /** + * @symbol ?_initializeGameplayUserManager\@ServerLevel\@\@AEAAXXZ + */ + MCAPI void _initializeGameplayUserManager(); /** * @symbol ?_initializePlayerSleepManager\@ServerLevel\@\@AEAAXXZ */ @@ -210,10 +206,18 @@ class ServerLevel { * @symbol ?_onGameplayUserAdded\@ServerLevel\@\@AEAAXAEAVEntityContext\@\@\@Z */ MCAPI void _onGameplayUserAdded(class EntityContext &); + /** + * @symbol ?_onGameplayUserRemoved\@ServerLevel\@\@AEAAXAEAVEntityContext\@\@\@Z + */ + MCAPI void _onGameplayUserRemoved(class EntityContext &); /** * @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/ServerLevelEventCoordinator.hpp b/LiteLoader/include/llapi/mc/ServerLevelEventCoordinator.hpp index 0d4a9de70c..9a26f2b133 100644 --- a/LiteLoader/include/llapi/mc/ServerLevelEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/ServerLevelEventCoordinator.hpp @@ -37,9 +37,5 @@ class ServerLevelEventCoordinator { * @symbol ?sendLevelRemovedPlayer\@ServerLevelEventCoordinator\@\@QEAAXAEAVLevel\@\@AEAVPlayer\@\@\@Z */ MCAPI void sendLevelRemovedPlayer(class Level &, class Player &); - /** - * @symbol ?sendLevelSaveData\@ServerLevelEventCoordinator\@\@QEAAXAEAVLevel\@\@AEAVCompoundTag\@\@\@Z - */ - MCAPI void sendLevelSaveData(class Level &, class CompoundTag &); }; diff --git a/LiteLoader/include/llapi/mc/ServerLocatorComposite.hpp b/LiteLoader/include/llapi/mc/ServerLocatorComposite.hpp deleted file mode 100644 index 5569e485fe..0000000000 --- a/LiteLoader/include/llapi/mc/ServerLocatorComposite.hpp +++ /dev/null @@ -1,129 +0,0 @@ -/** - * @file ServerLocatorComposite.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "RakPeerHelper.hpp" -#include "Bedrock.hpp" -#include "RakNet.hpp" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class ServerLocatorComposite. - * - */ -class ServerLocatorComposite { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SERVERLOCATORCOMPOSITE -public: - class ServerLocatorComposite& operator=(class ServerLocatorComposite const &) = delete; - ServerLocatorComposite(class ServerLocatorComposite const &) = 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 ?startAnnouncingServer\@ServerLocatorComposite\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0W4GameType\@\@HH_N2W4TransportLayer\@\@\@Z - */ - virtual void startAnnouncingServer(std::string const &, std::string const &, enum class GameType, int, int, bool, bool, enum class TransportLayer); - /** - * @vftbl 4 - * @symbol ?stopAnnouncingServer\@ServerLocatorComposite\@\@UEAAXXZ - */ - virtual void stopAnnouncingServer(); - /** - * @vftbl 5 - * @symbol ?startServerDiscovery\@ServerLocatorComposite\@\@UEAAXUPortPair\@\@\@Z - */ - virtual void startServerDiscovery(struct PortPair); - /** - * @vftbl 6 - * @symbol ?stopServerDiscovery\@ServerLocatorComposite\@\@UEAAXXZ - */ - virtual void stopServerDiscovery(); - /** - * @vftbl 7 - * @symbol ?addCustomServer\@ServerLocatorComposite\@\@UEAAXAEBVAsynchronousIPResolver\@\@H\@Z - */ - virtual void addCustomServer(class AsynchronousIPResolver const &, int); - /** - * @vftbl 8 - * @symbol ?addCustomServer\@ServerLocatorComposite\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z - */ - virtual void addCustomServer(std::string const &, int); - /** - * @vftbl 9 - * @symbol ?getServerList\@ServerLocatorComposite\@\@UEBA?AV?$vector\@UPingedCompatibleServer\@\@V?$allocator\@UPingedCompatibleServer\@\@\@std\@\@\@std\@\@XZ - */ - virtual std::vector getServerList() const; - /** - * @vftbl 10 - * @symbol ?clearServerList\@ServerLocatorComposite\@\@UEAAXXZ - */ - virtual void clearServerList(); - /** - * @vftbl 11 - * @symbol ?update\@ServerLocatorComposite\@\@UEAAXXZ - */ - virtual void update(); - /** - * @vftbl 12 - * @symbol ?isIPv4Supported\@ServerLocatorComposite\@\@UEBA_NXZ - */ - virtual bool isIPv4Supported() const; - /** - * @vftbl 13 - * @symbol ?isIPv6Supported\@ServerLocatorComposite\@\@UEBA_NXZ - */ - virtual bool isIPv6Supported() const; - /** - * @vftbl 14 - * @symbol ?getPingTimeForGUID\@ServerLocatorComposite\@\@UEAAMAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - virtual float getPingTimeForGUID(std::string const &); - /** - * @vftbl 15 - * @symbol ?checkCanConnectToCustomServerAsync\@ServerLocatorComposite\@\@UEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HV?$function\@$$A6AX_N\@Z\@3\@\@Z - */ - virtual void checkCanConnectToCustomServerAsync(std::string, int, class std::function); - /** - * @symbol ??0ServerLocatorComposite\@\@QEAA\@XZ - */ - MCAPI ServerLocatorComposite(); - /** - * @symbol ?initializeRakNetServerLocator\@ServerLocatorComposite\@\@QEAAXAEAVRakNetConnector\@\@AEAVIPSupportInterface\@RakPeerHelper\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@_NW4RakNetServerLANVisibility\@\@W4PermissionLAN\@\@W4PermissionIPv6\@\@AEBV?$NonOwnerPointer\@VAppPlatform\@\@\@Bedrock\@\@AEBV?$function\@$$A6A?AV?$unique_ptr\@VRakPeerInterface\@RakNet\@\@P6AXPEAV12\@\@Z\@std\@\@XZ\@6\@\@Z - */ - MCAPI void initializeRakNetServerLocator(class RakNetConnector &, class RakPeerHelper::IPSupportInterface &, std::vector, bool, enum class RakNetServerLANVisibility, enum class PermissionLAN, enum class PermissionIPv6, class Bedrock::NonOwnerPointer const &, class std::function (void)> const &); - /** - * @symbol ?setActiveTransportLayer\@ServerLocatorComposite\@\@QEAAXW4TransportLayer\@\@\@Z - */ - MCAPI void setActiveTransportLayer(enum class TransportLayer); - /** - * @symbol ?setNetherNetServerLocator\@ServerLocatorComposite\@\@QEAAX$$QEAV?$NonOwnerPointer\@UNetherNetConnector\@\@\@Bedrock\@\@\@Z - */ - MCAPI void setNetherNetServerLocator(class Bedrock::NonOwnerPointer &&); - -}; diff --git a/LiteLoader/include/llapi/mc/ServerMetricsImpl.hpp b/LiteLoader/include/llapi/mc/ServerMetricsImpl.hpp index 4e191e44e3..dc38d6b4a6 100644 --- a/LiteLoader/include/llapi/mc/ServerMetricsImpl.hpp +++ b/LiteLoader/include/llapi/mc/ServerMetricsImpl.hpp @@ -47,36 +47,6 @@ class ServerMetricsImpl { * @symbol ?sendChunkLoadTelemetryData\@ServerMetricsImpl\@\@UEAAXXZ */ virtual void sendChunkLoadTelemetryData(); - /** - * @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 ?_Delete_this\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEAAX_N\@Z - */ - virtual void _Delete_this(bool); - /** - * @vftbl 9 - * @symbol ?_Get\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEBAPEBXXZ - */ - virtual void const * _Get() const; /** * @symbol ??0ServerMetricsImpl\@\@QEAA\@PEAVServerCommunicationInterface\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ServerMoveInputHandler.hpp b/LiteLoader/include/llapi/mc/ServerMoveInputHandler.hpp deleted file mode 100644 index b8a5c163f5..0000000000 --- a/LiteLoader/include/llapi/mc/ServerMoveInputHandler.hpp +++ /dev/null @@ -1,80 +0,0 @@ -/** - * @file ServerMoveInputHandler.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "MoveInputHandler.hpp" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class ServerMoveInputHandler. - * - */ -class ServerMoveInputHandler : public MoveInputHandler { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SERVERMOVEINPUTHANDLER -public: - class ServerMoveInputHandler& operator=(class ServerMoveInputHandler const &) = delete; - ServerMoveInputHandler(class ServerMoveInputHandler const &) = delete; -#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 3 - * @symbol __unk_vfn_3 - */ - virtual void __unk_vfn_3(); - /** - * @vftbl 5 - * @symbol __unk_vfn_5 - */ - virtual void __unk_vfn_5(); - /** - * @vftbl 14 - * @symbol __unk_vfn_14 - */ - virtual void __unk_vfn_14(); -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SERVERMOVEINPUTHANDLER - /** - * @symbol ?registerInputHandlers\@ServerMoveInputHandler\@\@UEAAXAEAVInputHandler\@\@\@Z - */ - MCVAPI void registerInputHandlers(class InputHandler &); -#endif - /** - * @symbol ??0ServerMoveInputHandler\@\@QEAA\@XZ - */ - MCAPI ServerMoveInputHandler(); - /** - * @symbol ?calculateServerMoveVector\@ServerMoveInputHandler\@\@QEAAXAEAUIPlayerMovementProxy\@\@\@Z - */ - MCAPI void calculateServerMoveVector(struct IPlayerMovementProxy &); - /** - * @symbol ?digestPlayerInputPacket\@ServerMoveInputHandler\@\@QEAAXAEBVPlayerAuthInputPacket\@\@\@Z - */ - MCAPI void digestPlayerInputPacket(class PlayerAuthInputPacket const &); - /** - * @symbol ?getInputState\@ServerMoveInputHandler\@\@QEAAAEAUMoveInputState\@\@XZ - */ - MCAPI struct MoveInputState & getInputState(); - -}; diff --git a/LiteLoader/include/llapi/mc/ServerMoveInputHandlerSystem.hpp b/LiteLoader/include/llapi/mc/ServerMoveInputHandlerSystem.hpp index 5a8874493f..a217b4461b 100644 --- a/LiteLoader/include/llapi/mc/ServerMoveInputHandlerSystem.hpp +++ b/LiteLoader/include/llapi/mc/ServerMoveInputHandlerSystem.hpp @@ -28,5 +28,9 @@ class ServerMoveInputHandlerSystem { * @symbol ?create\@ServerMoveInputHandlerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); + /** + * @symbol ?digestPlayerInputPacket\@ServerMoveInputHandlerSystem\@\@SAXAEAUMoveInputComponent\@\@AEBVPlayerAuthInputPacket\@\@\@Z + */ + MCAPI static void digestPlayerInputPacket(struct MoveInputComponent &, class PlayerAuthInputPacket const &); }; diff --git a/LiteLoader/include/llapi/mc/ServerNetworkHandler.hpp b/LiteLoader/include/llapi/mc/ServerNetworkHandler.hpp index ff52bfa62a..a37366552a 100644 --- a/LiteLoader/include/llapi/mc/ServerNetworkHandler.hpp +++ b/LiteLoader/include/llapi/mc/ServerNetworkHandler.hpp @@ -63,9 +63,9 @@ class ServerNetworkHandler { */ MCVAPI class GameSpecificNetEventCallback * getGameSpecificNetEventCallback(); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestAbilityPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCodeBuilderSourcePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class RequestAbilityPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class CodeBuilderSourcePacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVChangeMobPropertyPacket\@\@\@Z */ @@ -91,33 +91,41 @@ class ServerNetworkHandler { */ MCVAPI void handle(class NetworkIdentifier const &, class CompletedUsingItemPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVItemStackRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVGameTestRequestPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class ItemStackRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class GameTestRequestPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLabTablePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMovePlayerPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class LabTablePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class MovePlayerPacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSubChunkRequestPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class SubChunkRequestPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerSkinPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PlayerSkinPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCodeBuilderSourcePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLabTablePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class CodeBuilderSourcePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class LabTablePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPositionTrackingDBClientRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNpcRequestPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class PositionTrackingDBClientRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class NpcRequestPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientCacheStatusPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ClientCacheStatusPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNpcRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestPermissionsPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class NpcRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class RequestPermissionsPacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientCacheBlobStatusPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class ClientCacheBlobStatusPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVItemFrameDropItemPacket\@\@\@Z */ @@ -127,21 +135,25 @@ class ServerNetworkHandler { */ MCVAPI void handle(class NetworkIdentifier const &, class ResourcePackChunkRequestPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestChunkRadiusPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBossEventPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class RequestChunkRadiusPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class BossEventPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVDebugInfoPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientToServerHandshakePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class DebugInfoPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class ClientToServerHandshakePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLoginPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBlockPickRequestPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class LoginPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class BlockPickRequestPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetPlayerGameTypePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMultiplayerSettingsPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class SetPlayerGameTypePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class MultiplayerSettingsPacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMapCreateLockedCopyPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class MapCreateLockedCopyPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVUpdatePlayerGameTypePacket\@\@\@Z */ @@ -155,65 +167,41 @@ class ServerNetworkHandler { */ MCVAPI void handle(class NetworkIdentifier const &, class LevelSoundEventPacketV2 const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMovePlayerPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class MovePlayerPacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBlockPickRequestPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class BlockPickRequestPacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMultiplayerSettingsPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCommandRequestPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class MultiplayerSettingsPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class CommandRequestPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSpawnExperienceOrbPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestAbilityPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class SpawnExperienceOrbPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class RequestAbilityPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerHotbarPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PlayerHotbarPacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestPermissionsPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class RequestPermissionsPacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEmotePacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class EmotePacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSubChunkRequestPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class SubChunkRequestPacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientCacheBlobStatusPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class ClientCacheBlobStatusPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVInventoryTransactionPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class InventoryTransactionPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBossEventPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class BossEventPacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetLocalPlayerAsInitializedPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEmotePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class SetLocalPlayerAsInitializedPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class EmotePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCommandRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestNetworkSettingsPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class CommandRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class RequestNetworkSettingsPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAnvilDamagePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class AnvilDamagePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVGameTestRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCraftingEventPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class GameTestRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class CraftingEventPacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVShowCreditsPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class ShowCreditsPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVDisconnectPacket\@\@\@Z */ @@ -222,26 +210,26 @@ class ServerNetworkHandler { * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetDifficultyPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SetDifficultyPacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSimpleEventPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class SimpleEventPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEmoteListPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class EmoteListPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBookEditPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetLocalPlayerAsInitializedPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class BookEditPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class SetLocalPlayerAsInitializedPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPassengerJumpPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PassengerJumpPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMapInfoRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSimpleEventPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class MapInfoRequestPacket const &); + 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 */ @@ -250,6 +238,10 @@ class ServerNetworkHandler { * @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 + */ + MCVAPI void handle(class NetworkIdentifier const &, class MapInfoRequestPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMobEquipmentPacket\@\@\@Z */ @@ -259,21 +251,21 @@ class ServerNetworkHandler { */ MCVAPI void handle(class NetworkIdentifier const &, class ScriptMessagePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMapCreateLockedCopyPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestChunkRadiusPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class MapCreateLockedCopyPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class RequestChunkRadiusPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVContainerClosePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ContainerClosePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerActionPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBookEditPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class PlayerActionPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class BookEditPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCraftingEventPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerActionPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class CraftingEventPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class PlayerActionPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVTextPacket\@\@\@Z */ @@ -290,22 +282,34 @@ class ServerNetworkHandler { * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerAuthInputPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PlayerAuthInputPacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSpawnExperienceOrbPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class SpawnExperienceOrbPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSettingsCommandPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SettingsCommandPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestNetworkSettingsPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPositionTrackingDBClientRequestPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class RequestNetworkSettingsPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class PositionTrackingDBClientRequestPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVTickSyncPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class TickSyncPacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetPlayerGameTypePacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class SetPlayerGameTypePacket const &); /** * @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 */ @@ -319,13 +323,17 @@ class ServerNetworkHandler { */ MCVAPI void handle(class NetworkIdentifier const &, class FilterTextPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVStructureTemplateDataRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLoginPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class StructureTemplateDataRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class LoginPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerInputPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PlayerInputPacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVStructureTemplateDataRequestPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class StructureTemplateDataRequestPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNetworkStackLatencyPacket\@\@\@Z */ @@ -338,22 +346,10 @@ class ServerNetworkHandler { * @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 */ MCVAPI void handle(class NetworkIdentifier const &, class CommandBlockUpdatePacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientToServerHandshakePacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class ClientToServerHandshakePacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVShowCreditsPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class ShowCreditsPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLecternUpdatePacket\@\@\@Z */ @@ -366,6 +362,10 @@ class ServerNetworkHandler { * @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 */ diff --git a/LiteLoader/include/llapi/mc/ServerNetworkSystem.hpp b/LiteLoader/include/llapi/mc/ServerNetworkSystem.hpp index 5f348ea351..5d7ddad6c9 100644 --- a/LiteLoader/include/llapi/mc/ServerNetworkSystem.hpp +++ b/LiteLoader/include/llapi/mc/ServerNetworkSystem.hpp @@ -6,6 +6,7 @@ #define AUTO_GENERATED #include "llapi/Global.h" #include "Bedrock.hpp" +#include "NetworkSystem.hpp" #define BEFORE_EXTRA @@ -25,9 +26,31 @@ class ServerNetworkSystem { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SERVERNETWORKSYSTEM /** - * @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\@\@\@\@\@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\@VMultiplayerServiceManager\@Social\@\@\@Bedrock\@\@\@7\@V?$not_null\@V?$NonOwnerPointer\@VIMinecraftEventing\@\@\@Bedrock\@\@\@7\@\@Z */ - MCAPI ServerNetworkSystem(class Scheduler &, std::vector const &, struct NetworkSystemToggles const &, class Bedrock::NonOwnerPointer const &, class ServiceReference); + 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; +#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 + */ + 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 + */ + 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 &); + +private: }; diff --git a/LiteLoader/include/llapi/mc/ServerPlayer.hpp b/LiteLoader/include/llapi/mc/ServerPlayer.hpp index 2b87f92754..001af44d86 100644 --- a/LiteLoader/include/llapi/mc/ServerPlayer.hpp +++ b/LiteLoader/include/llapi/mc/ServerPlayer.hpp @@ -50,517 +50,497 @@ class ServerPlayer : public Player { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@ServerPlayer\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 115 + * @vftbl 113 * @symbol ?isValidTarget\@ServerPlayer\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool isValidTarget(class Actor *) const; /** - * @vftbl 141 + * @vftbl 139 * @symbol ?handleEntityEvent\@ServerPlayer\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 150 + * @vftbl 148 * @symbol ?setArmor\@ServerPlayer\@\@UEAAXW4ArmorSlot\@\@AEBVItemStack\@\@\@Z */ virtual void setArmor(enum class ArmorSlot, class ItemStack const &); /** - * @vftbl 160 + * @vftbl 158 * @symbol ?setOffhandSlot\@ServerPlayer\@\@UEAAXAEBVItemStack\@\@\@Z */ virtual void setOffhandSlot(class ItemStack const &); /** - * @vftbl 165 + * @vftbl 163 * @symbol ?load\@ServerPlayer\@\@UEAA_NAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual bool load(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 177 + * @vftbl 175 * @symbol ?canChangeDimensionsUsingPortal\@ServerPlayer\@\@UEBA_NXZ */ virtual bool canChangeDimensionsUsingPortal() const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 179 + * @vftbl 177 * @symbol ?changeDimension\@ServerPlayer\@\@UEAAXV?$AutomaticID\@VDimension\@\@H\@\@\@Z */ virtual void changeDimension(class AutomaticID); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?getControllingPlayer\@ServerPlayer\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getControllingPlayer() const; /** - * @vftbl 181 + * @vftbl 179 * @symbol ?checkFallDamage\@ServerPlayer\@\@UEAAXM_N\@Z */ virtual void checkFallDamage(float, bool); /** - * @vftbl 183 + * @vftbl 181 * @symbol ?handleFallDistanceOnServer\@ServerPlayer\@\@UEAAXMM_N\@Z */ virtual void handleFallDistanceOnServer(float, float, bool); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 209 + * @vftbl 207 * @symbol ?onEffectAdded\@ServerPlayer\@\@MEAAXAEAVMobEffectInstance\@\@\@Z */ virtual void onEffectAdded(class MobEffectInstance &); /** - * @vftbl 210 + * @vftbl 208 * @symbol ?onEffectUpdated\@ServerPlayer\@\@MEAAXAEAVMobEffectInstance\@\@\@Z */ virtual void onEffectUpdated(class MobEffectInstance &); /** - * @vftbl 211 + * @vftbl 209 * @symbol ?onEffectRemoved\@ServerPlayer\@\@MEAAXAEAVMobEffectInstance\@\@\@Z */ virtual void onEffectRemoved(class MobEffectInstance &); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 245 + * @vftbl 237 * @symbol ?die\@ServerPlayer\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); + /** + * @vftbl 252 + * @symbol __unk_vfn_252 + */ + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); - /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 276 + * @vftbl 268 * @symbol ?knockback\@ServerPlayer\@\@UEAAXPEAVActor\@\@HMMMMM\@Z */ virtual void knockback(class Actor *, int, float, float, float, float, float); /** - * @vftbl 288 + * @vftbl 280 * @symbol ?aiStep\@ServerPlayer\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 313 + * @vftbl 305 * @symbol ?hurtArmorSlots\@ServerPlayer\@\@UEAAXAEBVActorDamageSource\@\@HV?$bitset\@$03\@std\@\@\@Z */ virtual void hurtArmorSlots(class ActorDamageSource const &, int, class std::bitset<4>); /** - * @vftbl 314 + * @vftbl 306 * @symbol ?setDamagedArmor\@ServerPlayer\@\@UEAAXW4ArmorSlot\@\@AEBVItemStack\@\@\@Z */ virtual void setDamagedArmor(enum class ArmorSlot, class ItemStack const &); /** - * @vftbl 315 + * @vftbl 307 * @symbol ?sendArmorDamage\@ServerPlayer\@\@UEAAXV?$bitset\@$03\@std\@\@\@Z */ virtual void sendArmorDamage(class std::bitset<4>); /** - * @vftbl 316 + * @vftbl 308 * @symbol ?sendArmor\@ServerPlayer\@\@UEAAXV?$bitset\@$03\@std\@\@\@Z */ virtual void sendArmor(class std::bitset<4>); /** - * @vftbl 326 + * @vftbl 318 * @symbol ?clearVanishEnchantedItemsOnDeath\@ServerPlayer\@\@UEAAXXZ */ virtual void clearVanishEnchantedItemsOnDeath(); /** - * @vftbl 327 + * @vftbl 319 * @symbol ?sendInventory\@ServerPlayer\@\@UEAAX_N\@Z */ virtual void sendInventory(bool); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** - * @vftbl 353 + * @vftbl 345 * @symbol ?prepareRegion\@ServerPlayer\@\@UEAAXAEAVChunkSource\@\@\@Z */ virtual void prepareRegion(class ChunkSource &); /** - * @vftbl 354 + * @vftbl 346 * @symbol ?destroyRegion\@ServerPlayer\@\@UEAAXXZ */ virtual void destroyRegion(); /** - * @vftbl 359 + * @vftbl 351 * @symbol ?changeDimensionWithCredits\@ServerPlayer\@\@UEAAXV?$AutomaticID\@VDimension\@\@H\@\@\@Z */ virtual void changeDimensionWithCredits(class AutomaticID); /** - * @vftbl 360 + * @vftbl 352 * @symbol ?tickWorld\@ServerPlayer\@\@UEAAXAEBUTick\@\@\@Z */ virtual void tickWorld(struct Tick const &); /** - * @vftbl 361 - * @symbol __unk_vfn_361 + * @vftbl 353 + * @symbol __unk_vfn_353 */ - virtual void __unk_vfn_361(); + virtual void __unk_vfn_353(); /** - * @vftbl 363 + * @vftbl 355 * @symbol ?moveView\@ServerPlayer\@\@UEAAXXZ */ virtual void moveView(); /** - * @vftbl 364 + * @vftbl 356 * @symbol ?moveSpawnView\@ServerPlayer\@\@UEAAXAEBVVec3\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ virtual void moveSpawnView(class Vec3 const &, class AutomaticID); /** - * @vftbl 367 + * @vftbl 359 * @symbol ?checkMovementStats\@ServerPlayer\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void checkMovementStats(class Vec3 const &); /** - * @vftbl 368 - * @symbol __unk_vfn_368 + * @vftbl 360 + * @symbol __unk_vfn_360 */ - virtual void __unk_vfn_368(); + virtual void __unk_vfn_360(); /** - * @vftbl 369 - * @symbol __unk_vfn_369 + * @vftbl 361 + * @symbol __unk_vfn_361 */ - virtual void __unk_vfn_369(); + virtual void __unk_vfn_361(); /** - * @vftbl 370 + * @vftbl 362 * @symbol ?respawn\@ServerPlayer\@\@UEAAXXZ */ virtual void respawn(); /** - * @vftbl 371 - * @symbol __unk_vfn_371 + * @vftbl 363 + * @symbol __unk_vfn_363 */ - virtual void __unk_vfn_371(); + virtual void __unk_vfn_363(); /** - * @vftbl 372 - * @symbol __unk_vfn_372 + * @vftbl 364 + * @symbol __unk_vfn_364 */ - virtual void __unk_vfn_372(); + virtual void __unk_vfn_364(); /** - * @vftbl 377 - * @symbol __unk_vfn_377 + * @vftbl 369 + * @symbol __unk_vfn_369 */ - virtual void __unk_vfn_377(); + virtual void __unk_vfn_369(); /** - * @vftbl 378 - * @symbol __unk_vfn_378 + * @vftbl 370 + * @symbol __unk_vfn_370 */ - virtual void __unk_vfn_378(); + virtual void __unk_vfn_370(); /** - * @vftbl 379 + * @vftbl 371 * @symbol ?openTrading\@ServerPlayer\@\@UEAAXAEBUActorUniqueID\@\@_N\@Z */ virtual void openTrading(struct ActorUniqueID const &, bool); /** - * @vftbl 381 - * @symbol __unk_vfn_381 + * @vftbl 373 + * @symbol __unk_vfn_373 */ - virtual void __unk_vfn_381(); + virtual void __unk_vfn_373(); /** - * @vftbl 382 + * @vftbl 374 * @symbol ?openNpcInteractScreen\@ServerPlayer\@\@UEAAXV?$shared_ptr\@UINpcDialogueData\@\@\@std\@\@\@Z */ virtual void openNpcInteractScreen(class std::shared_ptr); /** - * @vftbl 383 + * @vftbl 375 * @symbol ?openInventory\@ServerPlayer\@\@UEAAXXZ */ virtual void openInventory(); /** - * @vftbl 384 - * @symbol __unk_vfn_384 + * @vftbl 376 + * @symbol __unk_vfn_376 */ - virtual void __unk_vfn_384(); + virtual void __unk_vfn_376(); /** - * @vftbl 385 - * @symbol __unk_vfn_385 + * @vftbl 377 + * @symbol __unk_vfn_377 */ - virtual void __unk_vfn_385(); + virtual void __unk_vfn_377(); /** - * @vftbl 386 + * @vftbl 378 * @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 387 + * @vftbl 379 * @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 388 + * @vftbl 380 * @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 389 + * @vftbl 381 * @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 391 + * @vftbl 383 * @symbol ?stopSleepInBed\@ServerPlayer\@\@UEAAX_N0\@Z */ virtual void stopSleepInBed(bool, bool); /** - * @vftbl 395 + * @vftbl 387 * @symbol ?openSign\@ServerPlayer\@\@UEAAXAEBVBlockPos\@\@_N\@Z */ virtual void openSign(class BlockPos const &, bool); /** - * @vftbl 396 - * @symbol __unk_vfn_396 + * @vftbl 388 + * @symbol __unk_vfn_388 */ - virtual void __unk_vfn_396(); + virtual void __unk_vfn_388(); /** - * @vftbl 397 + * @vftbl 389 * @symbol ?isHostingPlayer\@ServerPlayer\@\@UEBA_NXZ */ virtual bool isHostingPlayer() const; /** - * @vftbl 398 + * @vftbl 390 * @symbol ?isLoading\@ServerPlayer\@\@UEBA_NXZ */ virtual bool isLoading() const; /** - * @vftbl 399 + * @vftbl 391 * @symbol ?isPlayerInitialized\@ServerPlayer\@\@UEBA_NXZ */ virtual bool isPlayerInitialized() const; /** - * @vftbl 400 - * @symbol __unk_vfn_400 + * @vftbl 392 + * @symbol __unk_vfn_392 */ - virtual void __unk_vfn_400(); + virtual void __unk_vfn_392(); /** - * @vftbl 403 + * @vftbl 395 * @symbol ?setPlayerGameType\@ServerPlayer\@\@UEAAXW4GameType\@\@\@Z */ virtual void setPlayerGameType(enum class GameType); /** - * @vftbl 407 - * @symbol __unk_vfn_407 + * @vftbl 399 + * @symbol __unk_vfn_399 */ - virtual void __unk_vfn_407(); + virtual void __unk_vfn_399(); /** - * @vftbl 411 + * @vftbl 403 * @symbol ?setContainerData\@ServerPlayer\@\@UEAAXAEAVIContainerManager\@\@HH\@Z */ virtual void setContainerData(class IContainerManager &, int, int); /** - * @vftbl 412 + * @vftbl 404 * @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 414 + * @vftbl 406 * @symbol ?refreshContainer\@ServerPlayer\@\@UEAAXAEAVIContainerManager\@\@\@Z */ virtual void refreshContainer(class IContainerManager &); /** - * @vftbl 416 + * @vftbl 408 * @symbol ?isActorRelevant\@ServerPlayer\@\@UEAA_NAEBVActor\@\@\@Z */ virtual bool isActorRelevant(class Actor const &); /** - * @vftbl 417 + * @vftbl 409 * @symbol ?isTeacher\@ServerPlayer\@\@UEBA_NXZ */ virtual bool isTeacher() const; /** - * @vftbl 418 + * @vftbl 410 * @symbol ?onSuspension\@ServerPlayer\@\@UEAAXXZ */ virtual void onSuspension(); /** - * @vftbl 419 + * @vftbl 411 * @symbol ?onLinkedSlotsChanged\@ServerPlayer\@\@UEAAXXZ */ virtual void onLinkedSlotsChanged(); /** - * @vftbl 425 + * @vftbl 417 * @symbol ?sendInventoryTransaction\@ServerPlayer\@\@UEBAXAEBVInventoryTransaction\@\@\@Z */ virtual void sendInventoryTransaction(class InventoryTransaction const &) const; /** - * @vftbl 426 + * @vftbl 418 * @symbol ?sendComplexInventoryTransaction\@ServerPlayer\@\@UEBAXV?$unique_ptr\@VComplexInventoryTransaction\@\@U?$default_delete\@VComplexInventoryTransaction\@\@\@std\@\@\@std\@\@\@Z */ virtual void sendComplexInventoryTransaction(std::unique_ptr) const; /** - * @vftbl 427 + * @vftbl 419 * @symbol ?sendNetworkPacket\@ServerPlayer\@\@UEBAXAEAVPacket\@\@\@Z */ virtual void sendNetworkPacket(class Packet &) const; /** - * @vftbl 428 + * @vftbl 420 * @symbol ?getPlayerEventCoordinator\@ServerPlayer\@\@UEAAAEAVPlayerEventCoordinator\@\@XZ */ virtual class PlayerEventCoordinator & getPlayerEventCoordinator(); /** - * @vftbl 429 - * @symbol ?tryGetMoveInputHandler\@ServerPlayer\@\@UEBAPEAVMoveInputHandler\@\@XZ - */ - virtual class MoveInputHandler * tryGetMoveInputHandler() const; - /** - * @vftbl 430 - * @symbol ?getInputMode\@ServerPlayer\@\@UEBA?AW4InputMode\@\@XZ - */ - virtual enum class InputMode getInputMode() const; - /** - * @vftbl 431 - * @symbol ?getPlayMode\@ServerPlayer\@\@UEBA?AW4ClientPlayMode\@\@XZ - */ - virtual enum class ClientPlayMode getPlayMode() const; - /** - * @vftbl 432 + * @vftbl 421 * @symbol ?reportMovementTelemetry\@ServerPlayer\@\@UEAAXW4MovementEventType\@\@\@Z */ virtual void reportMovementTelemetry(enum class MovementEventType); /** - * @vftbl 433 - * @symbol __unk_vfn_433 + * @vftbl 422 + * @symbol __unk_vfn_422 */ - virtual void __unk_vfn_433(); + virtual void __unk_vfn_422(); /** - * @vftbl 436 - * @symbol __unk_vfn_436 + * @vftbl 425 + * @symbol __unk_vfn_425 */ - virtual void __unk_vfn_436(); + virtual void __unk_vfn_425(); /** - * @vftbl 437 + * @vftbl 426 * @symbol ?getMaxChunkBuildRadius\@ServerPlayer\@\@UEBAEXZ */ virtual unsigned char getMaxChunkBuildRadius() const; /** - * @vftbl 441 + * @vftbl 430 * @symbol ?getEditorPlayer\@ServerPlayer\@\@UEBA?AV?$NonOwnerPointer\@VIEditorPlayer\@Editor\@\@\@Bedrock\@\@XZ */ virtual class Bedrock::NonOwnerPointer getEditorPlayer() const; /** - * @vftbl 442 + * @vftbl 431 * @symbol ?destroyEditorPlayer\@ServerPlayer\@\@UEAAXXZ */ virtual void destroyEditorPlayer(); /** - * @vftbl 443 + * @vftbl 432 * @symbol ?_getSpawnChunkLimit\@ServerPlayer\@\@MEBAHXZ */ virtual int _getSpawnChunkLimit() const; /** - * @vftbl 444 + * @vftbl 433 * @symbol ?_updateChunkPublisherView\@ServerPlayer\@\@MEAAXAEBVVec3\@\@M\@Z */ virtual void _updateChunkPublisherView(class Vec3 const &, float); @@ -606,10 +586,6 @@ class ServerPlayer : public Player { * @symbol ?getItemStackNetManagerServer\@ServerPlayer\@\@QEAAAEAVItemStackNetManagerServer\@\@XZ */ MCAPI class ItemStackNetManagerServer & getItemStackNetManagerServer(); - /** - * @symbol ?getServerMoveInputHandler\@ServerPlayer\@\@QEAAPEAVServerMoveInputHandler\@\@XZ - */ - MCAPI class ServerMoveInputHandler * getServerMoveInputHandler(); /** * @symbol ?handleActorPickRequestOnServer\@ServerPlayer\@\@QEAAXAEAVActor\@\@_N1\@Z */ @@ -646,6 +622,10 @@ class ServerPlayer : public Player { * @symbol ?sendMobEffectPackets\@ServerPlayer\@\@QEAAXXZ */ MCAPI void sendMobEffectPackets(); + /** + * @symbol ?sendPlayerAuthInputReceivedEvent\@ServerPlayer\@\@QEAAXXZ + */ + MCAPI void sendPlayerAuthInputReceivedEvent(); /** * @symbol ?sendPlayerOnGround\@ServerPlayer\@\@QEAAXXZ */ @@ -654,10 +634,6 @@ class ServerPlayer : public Player { * @symbol ?setClientChunkRadius\@ServerPlayer\@\@QEAAXIE\@Z */ MCAPI void setClientChunkRadius(unsigned int, unsigned char); - /** - * @symbol ?setInputMode\@ServerPlayer\@\@QEAAXAEBW4InputMode\@\@\@Z - */ - MCAPI void setInputMode(enum class InputMode const &); /** * @symbol ?setIsCompatibleWithClientSideChunkGen\@ServerPlayer\@\@QEAAX_N\@Z */ @@ -666,10 +642,6 @@ class ServerPlayer : public Player { * @symbol ?setLocalPlayerAsInitialized\@ServerPlayer\@\@QEAAXXZ */ MCAPI void setLocalPlayerAsInitialized(); - /** - * @symbol ?setPlayMode\@ServerPlayer\@\@QEAAXAEBW4ClientPlayMode\@\@\@Z - */ - MCAPI void setPlayMode(enum class ClientPlayMode const &); /** * @symbol ?setPlayerInput\@ServerPlayer\@\@QEAAXMM_N0\@Z */ diff --git a/LiteLoader/include/llapi/mc/ServerPlayerCurrentMovementComponent.hpp b/LiteLoader/include/llapi/mc/ServerPlayerCurrentMovementComponent.hpp index b7395e92ea..af888e9f10 100644 --- a/LiteLoader/include/llapi/mc/ServerPlayerCurrentMovementComponent.hpp +++ b/LiteLoader/include/llapi/mc/ServerPlayerCurrentMovementComponent.hpp @@ -27,6 +27,14 @@ struct ServerPlayerCurrentMovementComponent { #endif public: + /** + * @symbol ??0ServerPlayerCurrentMovementComponent\@\@QEAA\@$$QEAU0\@\@Z + */ + MCAPI ServerPlayerCurrentMovementComponent(struct ServerPlayerCurrentMovementComponent &&); + /** + * @symbol ??4ServerPlayerCurrentMovementComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z + */ + MCAPI struct ServerPlayerCurrentMovementComponent & operator=(struct ServerPlayerCurrentMovementComponent &&); /** * @symbol ??1ServerPlayerCurrentMovementComponent\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ServerPlayerMovementSystem.hpp b/LiteLoader/include/llapi/mc/ServerPlayerMovementSystem.hpp index 6388cf5547..17ceac14a7 100644 --- a/LiteLoader/include/llapi/mc/ServerPlayerMovementSystem.hpp +++ b/LiteLoader/include/llapi/mc/ServerPlayerMovementSystem.hpp @@ -30,12 +30,8 @@ class ServerPlayerMovementSystem { public: /** - * @symbol ?_foreachTransactionPacket\@ServerPlayerMovementSystem\@\@SAXAEBUPlayerActionComponent\@\@_NAEBV?$function\@$$A6AXAEAVInventoryTransactionPacket\@\@\@Z\@std\@\@\@Z + * @symbol ?createSystems\@ServerPlayerMovementSystem\@\@SA?AV?$array\@UTickingSystemWithInfo\@\@$0BE\@\@std\@\@XZ */ - MCAPI static void _foreachTransactionPacket(struct PlayerActionComponent const &, bool, class std::function const &); - /** - * @symbol ?create\@ServerPlayerMovementSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo create(); + MCAPI static class std::array createSystems(); }; diff --git a/LiteLoader/include/llapi/mc/ServerPlayerMovementSystemUtils.hpp b/LiteLoader/include/llapi/mc/ServerPlayerMovementSystemUtils.hpp index 1cd433089c..dddc9c1f2e 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 ?_handlePlayerAuthInputPacket\@ServerPlayerMovementSystemUtils\@\@YAXAEBVPlayerAuthInputPacket\@\@V?$not_null\@PEAVServerPlayer\@\@\@gsl\@\@\@Z + * @symbol ?_handlePlayerAuthInputPacketEnd\@ServerPlayerMovementSystemUtils\@\@YAXAEBUServerPlayerCurrentMovementComponent\@\@AEAVActorOwnerComponent\@\@\@Z */ - MCAPI void _handlePlayerAuthInputPacket(class PlayerAuthInputPacket const &, class gsl::not_null); + MCAPI void _handlePlayerAuthInputPacketEnd(struct ServerPlayerCurrentMovementComponent const &, class ActorOwnerComponent &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ServerPlayerSleepManager.hpp b/LiteLoader/include/llapi/mc/ServerPlayerSleepManager.hpp index acf5bdb9fb..87c14a2bb2 100644 --- a/LiteLoader/include/llapi/mc/ServerPlayerSleepManager.hpp +++ b/LiteLoader/include/llapi/mc/ServerPlayerSleepManager.hpp @@ -45,6 +45,10 @@ class ServerPlayerSleepManager { * @symbol ??0ServerPlayerSleepManager\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VGameplayUserManager\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ MCAPI ServerPlayerSleepManager(class gsl::not_null>); + /** + * @symbol ?initializeWithPlayerDeathManager\@ServerPlayerSleepManager\@\@QEAAXAEAVPlayerDeathManager\@\@\@Z + */ + MCAPI void initializeWithPlayerDeathManager(class PlayerDeathManager &); /** * @symbol ?registerOnPlayerWakeUp\@ServerPlayerSleepManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEAVPlayer\@\@\@Z\@std\@\@\@Z */ @@ -75,6 +79,10 @@ class ServerPlayerSleepManager { * @symbol ?_awakenAllPlayers\@ServerPlayerSleepManager\@\@AEAAXXZ */ MCAPI void _awakenAllPlayers(); + /** + * @symbol ?_onPlayerDeath\@ServerPlayerSleepManager\@\@AEAAXAEAVPlayer\@\@\@Z + */ + MCAPI void _onPlayerDeath(class Player &); private: diff --git a/LiteLoader/include/llapi/mc/ServerScoreboard.hpp b/LiteLoader/include/llapi/mc/ServerScoreboard.hpp index 56e0ffda4c..785be737dc 100644 --- a/LiteLoader/include/llapi/mc/ServerScoreboard.hpp +++ b/LiteLoader/include/llapi/mc/ServerScoreboard.hpp @@ -124,6 +124,10 @@ class ServerScoreboard { * @symbol ?deserialize\@ServerScoreboard\@\@QEAAXV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void deserialize(std::unique_ptr); + /** + * @symbol ?initializeImGui\@ServerScoreboard\@\@QEAAXAEAVLevel\@\@\@Z + */ + MCAPI void initializeImGui(class Level &); /** * @symbol ?serialize\@ServerScoreboard\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ServerSettingsRequestPacket.hpp b/LiteLoader/include/llapi/mc/ServerSettingsRequestPacket.hpp index b1660c8353..0316eee907 100644 --- a/LiteLoader/include/llapi/mc/ServerSettingsRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/ServerSettingsRequestPacket.hpp @@ -51,9 +51,9 @@ class ServerSettingsRequestPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ServerSettingsRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ServerSettingsRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ServerSettingsRequestPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ServerSettingsResponsePacket.hpp b/LiteLoader/include/llapi/mc/ServerSettingsResponsePacket.hpp index 2b94c8ca05..ddeb54ddb0 100644 --- a/LiteLoader/include/llapi/mc/ServerSettingsResponsePacket.hpp +++ b/LiteLoader/include/llapi/mc/ServerSettingsResponsePacket.hpp @@ -51,9 +51,9 @@ class ServerSettingsResponsePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ServerSettingsResponsePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ServerSettingsResponsePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ServerSettingsResponsePacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ServerStatsPacket.hpp b/LiteLoader/include/llapi/mc/ServerStatsPacket.hpp index 175b997f88..aebfe55e0a 100644 --- a/LiteLoader/include/llapi/mc/ServerStatsPacket.hpp +++ b/LiteLoader/include/llapi/mc/ServerStatsPacket.hpp @@ -50,8 +50,8 @@ class ServerStatsPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ServerStatsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ServerStatsPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/ServerToClientHandshakePacket.hpp b/LiteLoader/include/llapi/mc/ServerToClientHandshakePacket.hpp index 6187b301b1..c2a25ab907 100644 --- a/LiteLoader/include/llapi/mc/ServerToClientHandshakePacket.hpp +++ b/LiteLoader/include/llapi/mc/ServerToClientHandshakePacket.hpp @@ -51,9 +51,9 @@ class ServerToClientHandshakePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ServerToClientHandshakePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ServerToClientHandshakePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 b70819336f..8f80acc191 100644 --- a/LiteLoader/include/llapi/mc/SetActorDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetActorDataPacket.hpp @@ -51,22 +51,22 @@ class SetActorDataPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetActorDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetActorDataPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETACTORDATAPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~SetActorDataPacket(); #endif - /** - * @symbol ??0SetActorDataPacket\@\@QEAA\@VActorRuntimeID\@\@AEAVSynchedActorDataEntityWrapper\@\@PEAVPropertyComponent\@\@_K_N\@Z - */ - MCAPI SetActorDataPacket(class ActorRuntimeID, class SynchedActorDataEntityWrapper &, class PropertyComponent *, unsigned __int64, bool); /** * @symbol ??0SetActorDataPacket\@\@QEAA\@XZ */ MCAPI SetActorDataPacket(); + /** + * @symbol ??0SetActorDataPacket\@\@QEAA\@VActorRuntimeID\@\@AEAVSynchedActorDataEntityWrapper\@\@PEAVPropertyComponent\@\@_K_N\@Z + */ + MCAPI SetActorDataPacket(class ActorRuntimeID, class SynchedActorDataEntityWrapper &, class PropertyComponent *, unsigned __int64, bool); }; diff --git a/LiteLoader/include/llapi/mc/SetActorLinkPacket.hpp b/LiteLoader/include/llapi/mc/SetActorLinkPacket.hpp index 9a3236fdb7..65c78ca729 100644 --- a/LiteLoader/include/llapi/mc/SetActorLinkPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetActorLinkPacket.hpp @@ -51,9 +51,9 @@ class SetActorLinkPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetActorLinkPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetActorLinkPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETACTORLINKPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/SetActorMotionPacket.hpp b/LiteLoader/include/llapi/mc/SetActorMotionPacket.hpp index 40fef1f17a..feacacc463 100644 --- a/LiteLoader/include/llapi/mc/SetActorMotionPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetActorMotionPacket.hpp @@ -51,22 +51,22 @@ class SetActorMotionPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetActorMotionPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetActorMotionPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETACTORMOTIONPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~SetActorMotionPacket(); #endif - /** - * @symbol ??0SetActorMotionPacket\@\@QEAA\@AEBVActor\@\@\@Z - */ - MCAPI SetActorMotionPacket(class Actor const &); /** * @symbol ??0SetActorMotionPacket\@\@QEAA\@XZ */ MCAPI SetActorMotionPacket(); + /** + * @symbol ??0SetActorMotionPacket\@\@QEAA\@AEBVActor\@\@\@Z + */ + MCAPI SetActorMotionPacket(class Actor const &); }; diff --git a/LiteLoader/include/llapi/mc/SetCommandsEnabledPacket.hpp b/LiteLoader/include/llapi/mc/SetCommandsEnabledPacket.hpp index 4368511a07..630d964910 100644 --- a/LiteLoader/include/llapi/mc/SetCommandsEnabledPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetCommandsEnabledPacket.hpp @@ -51,9 +51,9 @@ class SetCommandsEnabledPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetCommandsEnabledPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetCommandsEnabledPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETCOMMANDSENABLEDPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/SetDefaultGameTypePacket.hpp b/LiteLoader/include/llapi/mc/SetDefaultGameTypePacket.hpp index 5254178fa9..d965aadbab 100644 --- a/LiteLoader/include/llapi/mc/SetDefaultGameTypePacket.hpp +++ b/LiteLoader/include/llapi/mc/SetDefaultGameTypePacket.hpp @@ -51,9 +51,9 @@ class SetDefaultGameTypePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetDefaultGameTypePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetDefaultGameTypePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0SetDefaultGameTypePacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/SetDifficultyPacket.hpp b/LiteLoader/include/llapi/mc/SetDifficultyPacket.hpp index c4270961d5..dc27bb7faf 100644 --- a/LiteLoader/include/llapi/mc/SetDifficultyPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetDifficultyPacket.hpp @@ -51,9 +51,9 @@ class SetDifficultyPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetDifficultyPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetDifficultyPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 c59d4b3010..683b855e0e 100644 --- a/LiteLoader/include/llapi/mc/SetDisplayObjectivePacket.hpp +++ b/LiteLoader/include/llapi/mc/SetDisplayObjectivePacket.hpp @@ -52,9 +52,9 @@ class SetDisplayObjectivePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetDisplayObjectivePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetDisplayObjectivePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 index 92cd4080bf..1d6cf39207 100644 --- a/LiteLoader/include/llapi/mc/SetEntityInsideSystem.hpp +++ b/LiteLoader/include/llapi/mc/SetEntityInsideSystem.hpp @@ -10,34 +10,23 @@ #undef BEFORE_EXTRA -/** - * @brief MC class SetEntityInsideSystem. - * - */ -class SetEntityInsideSystem { + +namespace SetEntityInsideSystem { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SETENTITYINSIDESYSTEM -public: - class SetEntityInsideSystem& operator=(class SetEntityInsideSystem const &) = delete; - SetEntityInsideSystem(class SetEntityInsideSystem const &) = delete; - SetEntityInsideSystem() = delete; -#endif - -public: /** - * @symbol ?createCleanupSystem\@SetEntityInsideSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createCleanupSystem\@SetEntityInsideSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static struct TickingSystemWithInfo createCleanupSystem(); + MCAPI struct TickingSystemWithInfo createCleanupSystem(); /** - * @symbol ?createSpectatorFilter\@SetEntityInsideSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSpectatorFilterSystem\@SetEntityInsideSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static struct TickingSystemWithInfo createSpectatorFilter(); + MCAPI struct TickingSystemWithInfo createSpectatorFilterSystem(); /** - * @symbol ?createSystem\@SetEntityInsideSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@SetEntityInsideSystem\@\@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/SetHealthPacket.hpp b/LiteLoader/include/llapi/mc/SetHealthPacket.hpp index a3cc5e65bb..44a78b05e3 100644 --- a/LiteLoader/include/llapi/mc/SetHealthPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetHealthPacket.hpp @@ -52,9 +52,9 @@ class SetHealthPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetHealthPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetHealthPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 32782552fe..8bc8444bcc 100644 --- a/LiteLoader/include/llapi/mc/SetLastHurtByPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetLastHurtByPacket.hpp @@ -51,9 +51,9 @@ class SetLastHurtByPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetLastHurtByPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetLastHurtByPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 c21267f12b..740f750a6b 100644 --- a/LiteLoader/include/llapi/mc/SetLocalPlayerAsInitializedPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetLocalPlayerAsInitializedPacket.hpp @@ -51,9 +51,9 @@ class SetLocalPlayerAsInitializedPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetLocalPlayerAsInitializedPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetLocalPlayerAsInitializedPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0SetLocalPlayerAsInitializedPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/SetPlayerGameTypePacket.hpp b/LiteLoader/include/llapi/mc/SetPlayerGameTypePacket.hpp index 3922db046c..c4c56385e9 100644 --- a/LiteLoader/include/llapi/mc/SetPlayerGameTypePacket.hpp +++ b/LiteLoader/include/llapi/mc/SetPlayerGameTypePacket.hpp @@ -51,9 +51,9 @@ class SetPlayerGameTypePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetPlayerGameTypePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetPlayerGameTypePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0SetPlayerGameTypePacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/SetPreviousPosRotSystem.hpp b/LiteLoader/include/llapi/mc/SetPreviousPosRotSystem.hpp index 1bead958f9..ea38f6118c 100644 --- a/LiteLoader/include/llapi/mc/SetPreviousPosRotSystem.hpp +++ b/LiteLoader/include/llapi/mc/SetPreviousPosRotSystem.hpp @@ -31,5 +31,9 @@ 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/SetScorePacket.hpp b/LiteLoader/include/llapi/mc/SetScorePacket.hpp index 4a7528a4c4..02137e00e3 100644 --- a/LiteLoader/include/llapi/mc/SetScorePacket.hpp +++ b/LiteLoader/include/llapi/mc/SetScorePacket.hpp @@ -52,9 +52,9 @@ class SetScorePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetScorePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetScorePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 73396824ca..1ab50e6041 100644 --- a/LiteLoader/include/llapi/mc/SetScoreboardIdentityPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetScoreboardIdentityPacket.hpp @@ -52,9 +52,9 @@ class SetScoreboardIdentityPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetScoreboardIdentityPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetScoreboardIdentityPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 08742665c2..6708bd202a 100644 --- a/LiteLoader/include/llapi/mc/SetSpawnPositionPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetSpawnPositionPacket.hpp @@ -51,23 +51,23 @@ class SetSpawnPositionPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetSpawnPositionPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetSpawnPositionPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETSPAWNPOSITIONPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~SetSpawnPositionPacket(); #endif - /** - * @symbol ??0SetSpawnPositionPacket\@\@QEAA\@V?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@1\@Z - */ - MCAPI SetSpawnPositionPacket(class AutomaticID, class BlockPos const &, class BlockPos const &); /** * @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 + */ + MCAPI SetSpawnPositionPacket(class AutomaticID, class BlockPos const &, class BlockPos const &); /** * @symbol ??0SetSpawnPositionPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/SetTimePacket.hpp b/LiteLoader/include/llapi/mc/SetTimePacket.hpp index a833adb12a..c26709a9ea 100644 --- a/LiteLoader/include/llapi/mc/SetTimePacket.hpp +++ b/LiteLoader/include/llapi/mc/SetTimePacket.hpp @@ -51,9 +51,9 @@ class SetTimePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetTimePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetTimePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 59672bf0a6..c4ef84e77a 100644 --- a/LiteLoader/include/llapi/mc/SetTitlePacket.hpp +++ b/LiteLoader/include/llapi/mc/SetTitlePacket.hpp @@ -52,9 +52,9 @@ enum class TitleType; virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetTitlePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetTitlePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETTITLEPACKET /** * @symbol __unk_destructor_-1 @@ -62,29 +62,29 @@ enum class TitleType; MCVAPI ~SetTitlePacket(); #endif /** - * @symbol ??0SetTitlePacket\@\@QEAA\@XZ + * @symbol ??0SetTitlePacket\@\@QEAA\@AEBV0\@\@Z */ - MCAPI SetTitlePacket(); + MCAPI SetTitlePacket(class SetTitlePacket const &); /** - * @symbol ??0SetTitlePacket\@\@QEAA\@W4TitleType\@0\@\@Z + * @symbol ??0SetTitlePacket\@\@QEAA\@XZ */ - MCAPI SetTitlePacket(enum class SetTitlePacket::TitleType); + MCAPI SetTitlePacket(); /** * @symbol ??0SetTitlePacket\@\@QEAA\@HHH\@Z */ MCAPI SetTitlePacket(int, int, int); /** - * @symbol ??0SetTitlePacket\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI SetTitlePacket(class SetTitlePacket const &); - /** - * @symbol ??0SetTitlePacket\@\@QEAA\@W4TitleType\@0\@AEBVResolvedTextObject\@\@\@Z + * @symbol ??0SetTitlePacket\@\@QEAA\@W4TitleType\@0\@\@Z */ - MCAPI SetTitlePacket(enum class SetTitlePacket::TitleType, class ResolvedTextObject const &); + 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 */ MCAPI SetTitlePacket(enum class SetTitlePacket::TitleType, std::string const &); + /** + * @symbol ??0SetTitlePacket\@\@QEAA\@W4TitleType\@0\@AEBVResolvedTextObject\@\@\@Z + */ + MCAPI SetTitlePacket(enum class SetTitlePacket::TitleType, class ResolvedTextObject const &); /** * @symbol ??4SetTitlePacket\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SettingsCommandPacket.hpp b/LiteLoader/include/llapi/mc/SettingsCommandPacket.hpp index 4b754b5932..9c02635ca7 100644 --- a/LiteLoader/include/llapi/mc/SettingsCommandPacket.hpp +++ b/LiteLoader/include/llapi/mc/SettingsCommandPacket.hpp @@ -51,9 +51,9 @@ class SettingsCommandPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SettingsCommandPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SettingsCommandPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0SettingsCommandPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ShapedChemistryRecipe.hpp b/LiteLoader/include/llapi/mc/ShapedChemistryRecipe.hpp index 45a3e9f29a..4b7b737ae4 100644 --- a/LiteLoader/include/llapi/mc/ShapedChemistryRecipe.hpp +++ b/LiteLoader/include/llapi/mc/ShapedChemistryRecipe.hpp @@ -42,9 +42,9 @@ class ShapedChemistryRecipe : public ShapedRecipe { virtual void __unk_vfn_5(); /** * @vftbl 6 - * @symbol ?matches\@ShapedChemistryRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @symbol ?matches\@ShapedChemistryRecipe\@\@UEBA_NAEBVCraftingContainer\@\@AEBVCraftingContext\@\@\@Z */ - virtual bool matches(class CraftingContainer &, class Level &) const; + virtual bool matches(class CraftingContainer const &, class CraftingContext const &) const; /** * @vftbl 8 * @symbol ?getId\@ShapedChemistryRecipe\@\@UEBAAEBVUUID\@mce\@\@XZ diff --git a/LiteLoader/include/llapi/mc/ShapedRecipe.hpp b/LiteLoader/include/llapi/mc/ShapedRecipe.hpp index 0ab29d33eb..cb9c39cf92 100644 --- a/LiteLoader/include/llapi/mc/ShapedRecipe.hpp +++ b/LiteLoader/include/llapi/mc/ShapedRecipe.hpp @@ -37,9 +37,9 @@ class ShapedRecipe : public Recipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@ShapedRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z + * @symbol ?assemble\@ShapedRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEAVCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; + virtual std::vector const & assemble(class CraftingContainer &, class CraftingContext &) const; /** * @vftbl 2 * @symbol ?getCraftingSize\@ShapedRecipe\@\@UEBAHXZ @@ -62,9 +62,9 @@ class ShapedRecipe : public Recipe { virtual void __unk_vfn_5(); /** * @vftbl 6 - * @symbol ?matches\@ShapedRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @symbol ?matches\@ShapedRecipe\@\@UEBA_NAEBVCraftingContainer\@\@AEBVCraftingContext\@\@\@Z */ - virtual bool matches(class CraftingContainer &, class Level &) const; + virtual bool matches(class CraftingContainer const &, class CraftingContext const &) const; /** * @vftbl 7 * @symbol ?size\@ShapedRecipe\@\@UEBAHXZ @@ -96,9 +96,9 @@ class ShapedRecipe : public Recipe { //private: /** - * @symbol ?matches\@ShapedRecipe\@\@AEBA_NAEAVCraftingContainer\@\@HH_N\@Z + * @symbol ?matches\@ShapedRecipe\@\@AEBA_NAEBVCraftingContainer\@\@HH_N\@Z */ - MCAPI bool matches(class CraftingContainer &, int, int, bool) const; + MCAPI bool matches(class CraftingContainer const &, int, int, bool) const; private: diff --git a/LiteLoader/include/llapi/mc/ShapelessChemistryRecipe.hpp b/LiteLoader/include/llapi/mc/ShapelessChemistryRecipe.hpp index fed01add9f..37073d92bd 100644 --- a/LiteLoader/include/llapi/mc/ShapelessChemistryRecipe.hpp +++ b/LiteLoader/include/llapi/mc/ShapelessChemistryRecipe.hpp @@ -42,9 +42,9 @@ class ShapelessChemistryRecipe : public ShapelessRecipe { virtual void __unk_vfn_5(); /** * @vftbl 6 - * @symbol ?matches\@ShapelessChemistryRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @symbol ?matches\@ShapelessChemistryRecipe\@\@UEBA_NAEBVCraftingContainer\@\@AEBVCraftingContext\@\@\@Z */ - virtual bool matches(class CraftingContainer &, class Level &) const; + virtual bool matches(class CraftingContainer const &, class CraftingContext const &) const; /** * @vftbl 8 * @symbol ?getId\@ShapelessChemistryRecipe\@\@UEBAAEBVUUID\@mce\@\@XZ diff --git a/LiteLoader/include/llapi/mc/ShapelessRecipe.hpp b/LiteLoader/include/llapi/mc/ShapelessRecipe.hpp index 4ec27c9f01..389f959890 100644 --- a/LiteLoader/include/llapi/mc/ShapelessRecipe.hpp +++ b/LiteLoader/include/llapi/mc/ShapelessRecipe.hpp @@ -37,9 +37,9 @@ class ShapelessRecipe : public Recipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@ShapelessRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z + * @symbol ?assemble\@ShapelessRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEAVCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; + virtual std::vector const & assemble(class CraftingContainer &, class CraftingContext &) const; /** * @vftbl 2 * @symbol ?getCraftingSize\@ShapelessRecipe\@\@UEBAHXZ @@ -62,9 +62,9 @@ class ShapelessRecipe : public Recipe { virtual void __unk_vfn_5(); /** * @vftbl 6 - * @symbol ?matches\@ShapelessRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @symbol ?matches\@ShapelessRecipe\@\@UEBA_NAEBVCraftingContainer\@\@AEBVCraftingContext\@\@\@Z */ - virtual bool matches(class CraftingContainer &, class Level &) const; + virtual bool matches(class CraftingContainer const &, class CraftingContext const &) const; /** * @vftbl 7 * @symbol ?size\@ShapelessRecipe\@\@UEBAHXZ diff --git a/LiteLoader/include/llapi/mc/ShareableComponent.hpp b/LiteLoader/include/llapi/mc/ShareableComponent.hpp index 056997c9d2..dc081f9a6b 100644 --- a/LiteLoader/include/llapi/mc/ShareableComponent.hpp +++ b/LiteLoader/include/llapi/mc/ShareableComponent.hpp @@ -41,14 +41,14 @@ class ShareableComponent { * @symbol ?getSlotToSwap\@ShareableComponent\@\@QEBAHAEAVActor\@\@AEBVItemActor\@\@\@Z */ MCAPI int getSlotToSwap(class Actor &, class ItemActor const &) const; - /** - * @symbol ?hasSurplus\@ShareableComponent\@\@QEBAHAEAVActor\@\@AEBVItemStack\@\@_N\@Z - */ - MCAPI int hasSurplus(class Actor &, class ItemStack const &, bool) const; /** * @symbol ?hasSurplus\@ShareableComponent\@\@QEBAHAEAVActor\@\@AEBVItemStack\@\@AEAV3\@_N\@Z */ MCAPI int hasSurplus(class Actor &, class ItemStack const &, class ItemStack &, bool) const; + /** + * @symbol ?hasSurplus\@ShareableComponent\@\@QEBAHAEAVActor\@\@AEBVItemStack\@\@_N\@Z + */ + MCAPI int hasSurplus(class Actor &, class ItemStack const &, bool) const; /** * @symbol ?itemBelongsInInventory\@ShareableComponent\@\@QEBA_NAEAVActor\@\@AEBVItemStack\@\@_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/SharedConstants.hpp b/LiteLoader/include/llapi/mc/SharedConstants.hpp index 1f22a4abb9..66918b2016 100644 --- a/LiteLoader/include/llapi/mc/SharedConstants.hpp +++ b/LiteLoader/include/llapi/mc/SharedConstants.hpp @@ -122,6 +122,10 @@ namespace SharedConstants { * @symbol ?NetworkEphemeralPort\@SharedConstants\@\@3GB */ MCAPI extern unsigned short const NetworkEphemeralPort; + /** + * @symbol ?NetworkMaxPlayerCount\@SharedConstants\@\@3HB + */ + MCAPI extern int const NetworkMaxPlayerCount; /** * @symbol ?NetworkProtocolVersion\@SharedConstants\@\@3HB */ diff --git a/LiteLoader/include/llapi/mc/ShearsItem.hpp b/LiteLoader/include/llapi/mc/ShearsItem.hpp index 6c4b09ae2b..66d92ba292 100644 --- a/LiteLoader/include/llapi/mc/ShearsItem.hpp +++ b/LiteLoader/include/llapi/mc/ShearsItem.hpp @@ -36,11 +36,6 @@ class ShearsItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class ShearsItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 44 * @symbol ?canDestroySpecial\@ShearsItem\@\@UEBA_NAEBVBlock\@\@\@Z @@ -132,7 +132,17 @@ class ShearsItem : public Item { */ virtual bool mineBlock(class ItemStack &, class Block const &, int, int, int, class Actor *) const; /** - * @vftbl 132 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 134 * @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 2f8ceb463f..1db1c1d2ba 100644 --- a/LiteLoader/include/llapi/mc/Sheep.hpp +++ b/LiteLoader/include/llapi/mc/Sheep.hpp @@ -37,135 +37,125 @@ class Sheep : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 141 + * @vftbl 139 * @symbol ?handleEntityEvent\@Sheep\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 + */ + virtual void __unk_vfn_176(); + /** + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); - /** - * @vftbl 275 - * @symbol __unk_vfn_275 - */ - virtual void __unk_vfn_275(); - /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_267(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_293(); /** - * @vftbl 346 - * @symbol ?newServerAiStep\@Sheep\@\@MEAAXXZ + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void newServerAiStep(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0Sheep\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ShieldItem.hpp b/LiteLoader/include/llapi/mc/ShieldItem.hpp index b8de4b3601..41ce8b53ef 100644 --- a/LiteLoader/include/llapi/mc/ShieldItem.hpp +++ b/LiteLoader/include/llapi/mc/ShieldItem.hpp @@ -36,11 +36,6 @@ class ShieldItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class ShieldItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 49 * @symbol ?isHandEquipped\@ShieldItem\@\@UEBA_NXZ @@ -176,6 +176,16 @@ class ShieldItem : public Item { * @symbol ?getInHandUpdateType\@ShieldItem\@\@UEBA?AW4InHandUpdateType\@\@AEBVPlayer\@\@AEBVItemStack\@\@1_N2\@Z */ virtual enum class InHandUpdateType getInHandUpdateType(class Player const &, class ItemStack const &, class ItemStack const &, bool, bool) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); /** * @symbol ??0ShieldItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/ShieldRecipe.hpp b/LiteLoader/include/llapi/mc/ShieldRecipe.hpp index ea00a861f0..de40689002 100644 --- a/LiteLoader/include/llapi/mc/ShieldRecipe.hpp +++ b/LiteLoader/include/llapi/mc/ShieldRecipe.hpp @@ -32,9 +32,9 @@ class ShieldRecipe : public Recipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@ShieldRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z + * @symbol ?assemble\@ShieldRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEAVCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; + virtual std::vector const & assemble(class CraftingContainer &, class CraftingContext &) const; /** * @vftbl 2 * @symbol ?getCraftingSize\@ShieldRecipe\@\@UEBAHXZ @@ -57,9 +57,9 @@ class ShieldRecipe : public Recipe { virtual void __unk_vfn_5(); /** * @vftbl 6 - * @symbol ?matches\@ShieldRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @symbol ?matches\@ShieldRecipe\@\@UEBA_NAEBVCraftingContainer\@\@AEBVCraftingContext\@\@\@Z */ - virtual bool matches(class CraftingContainer &, class Level &) const; + virtual bool matches(class CraftingContainer const &, class CraftingContext const &) const; /** * @vftbl 7 * @symbol ?size\@ShieldRecipe\@\@UEBAHXZ diff --git a/LiteLoader/include/llapi/mc/ShooterItemComponent.hpp b/LiteLoader/include/llapi/mc/ShooterItemComponent.hpp index 59c5544c0a..f6495e863f 100644 --- a/LiteLoader/include/llapi/mc/ShooterItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/ShooterItemComponent.hpp @@ -46,21 +46,16 @@ class ShooterItemComponent { virtual void __unk_vfn_2(); /** * @vftbl 3 - * @symbol __unk_vfn_3 - */ - virtual void __unk_vfn_3(); - /** - * @vftbl 4 * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VShooterItemComponent\@\@\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 + * @vftbl 4 * @symbol ?buildNetworkTag\@?$NetworkedItemComponent\@VShooterItemComponent\@\@\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 5 * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VShooterItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/ShortTag.hpp b/LiteLoader/include/llapi/mc/ShortTag.hpp index 606d984148..824131b30a 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 ?write\@ShortTag\@\@UEBAXAEAVIDataOutput\@\@\@Z + * @symbol __unk_vfn_2 */ - virtual void write(class IDataOutput &) const; + virtual void __unk_vfn_2(); /** * @vftbl 3 * @symbol ?load\@ShortTag\@\@UEAAXAEAVIDataInput\@\@\@Z @@ -79,6 +79,12 @@ 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 4e2385bc1b..872d1214e2 100644 --- a/LiteLoader/include/llapi/mc/ShovelItem.hpp +++ b/LiteLoader/include/llapi/mc/ShovelItem.hpp @@ -37,11 +37,6 @@ class ShovelItem : public DiggerItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 10 * @symbol ?executeEvent\@ShovelItem\@\@UEBAXAEAVItemStackBase\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVRenderParams\@\@\@Z @@ -62,6 +57,11 @@ class ShovelItem : public DiggerItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 44 * @symbol ?canDestroySpecial\@ShovelItem\@\@UEBA_NAEBVBlock\@\@\@Z @@ -118,7 +118,17 @@ class ShovelItem : public DiggerItem { */ virtual void __unk_vfn_80(); /** - * @vftbl 132 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 134 * @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 8405ad00bf..424fb92461 100644 --- a/LiteLoader/include/llapi/mc/ShowCreditsPacket.hpp +++ b/LiteLoader/include/llapi/mc/ShowCreditsPacket.hpp @@ -64,9 +64,9 @@ class ShowCreditsPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ShowCreditsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ShowCreditsPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 77a27f179d..71992f32ff 100644 --- a/LiteLoader/include/llapi/mc/ShowProfilePacket.hpp +++ b/LiteLoader/include/llapi/mc/ShowProfilePacket.hpp @@ -51,9 +51,9 @@ class ShowProfilePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ShowProfilePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ShowProfilePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ShowProfilePacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ShowStoreOfferPacket.hpp b/LiteLoader/include/llapi/mc/ShowStoreOfferPacket.hpp index 3eb7799642..20eb7c1f64 100644 --- a/LiteLoader/include/llapi/mc/ShowStoreOfferPacket.hpp +++ b/LiteLoader/include/llapi/mc/ShowStoreOfferPacket.hpp @@ -51,9 +51,9 @@ class ShowStoreOfferPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ShowStoreOfferPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ShowStoreOfferPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ShowStoreOfferPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/Shulker.hpp b/LiteLoader/include/llapi/mc/Shulker.hpp index ce59295ff6..9aa6d03d87 100644 --- a/LiteLoader/include/llapi/mc/Shulker.hpp +++ b/LiteLoader/include/llapi/mc/Shulker.hpp @@ -42,70 +42,65 @@ class Shulker : public Mob { */ virtual void __unk_vfn_16(); /** - * @vftbl 20 - * @symbol ?setPos\@Shulker\@\@UEAAXAEBVVec3\@\@\@Z + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void setPos(class Vec3 const &); + virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 - */ - virtual void __unk_vfn_41(); - /** - * @vftbl 59 + * @vftbl 58 * @symbol ?isInWall\@Shulker\@\@UEBA_NXZ */ virtual bool isInWall() const; /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 80 + * @vftbl 78 * @symbol ?getShadowRadius\@Shulker\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 @@ -113,139 +108,134 @@ class Shulker : public Mob { virtual void __unk_vfn_109(); /** * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 113 * @symbol ?canAttack\@Shulker\@\@UEBA_NPEAVActor\@\@_N\@Z */ virtual bool canAttack(class Actor *, bool) const; /** - * @vftbl 131 + * @vftbl 129 * @symbol ?shouldRender\@Shulker\@\@UEBA_NXZ */ virtual bool shouldRender() const; /** - * @vftbl 134 + * @vftbl 132 * @symbol ?isInvulnerableTo\@Shulker\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 142 + * @vftbl 140 * @symbol ?getPickRadius\@Shulker\@\@UEAAMXZ */ virtual float getPickRadius(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 258 + * @vftbl 250 * @symbol ?updateEntitySpecificMolangVariables\@Shulker\@\@MEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@Shulker\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@Shulker\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@Shulker\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 274 + * @vftbl 266 * @symbol ?_onSizeUpdated\@Shulker\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 286 + * @vftbl 278 * @symbol ?travel\@Shulker\@\@UEAAXMMM_N\@Z */ virtual void travel(float, float, float, bool); /** - * @vftbl 293 + * @vftbl 285 * @symbol ?checkSpawnRules\@Shulker\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 302 + * @vftbl 294 * @symbol ?getMaxHeadXRot\@Shulker\@\@UEAAMXZ */ virtual float getMaxHeadXRot(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 310 + * @vftbl 302 * @symbol ?getArmorValue\@Shulker\@\@UEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 343 + * @vftbl 335 * @symbol ?initBodyControl\@Shulker\@\@UEAA?AV?$unique_ptr\@VBodyControl\@\@U?$default_delete\@VBodyControl\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr initBodyControl(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); #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 62bb21f554..08ee9ca1f1 100644 --- a/LiteLoader/include/llapi/mc/ShulkerBoxBlock.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerBoxBlock.hpp @@ -40,16 +40,21 @@ class ShulkerBoxBlock : public UndyedShulkerBoxBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class ShulkerBoxBlock : public UndyedShulkerBoxBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class ShulkerBoxBlock : public UndyedShulkerBoxBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,125 +131,120 @@ class ShulkerBoxBlock : public UndyedShulkerBoxBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@ShulkerBoxBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 136 + * @vftbl 134 * @symbol ?getColor\@ShulkerBoxBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 139 + * @vftbl 137 * @symbol ?getColorForParticle\@ShulkerBoxBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColorForParticle(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 186 + * @vftbl 185 * @symbol ?getMapColor\@ShulkerBoxBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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/ShulkerBoxBlockItem.hpp b/LiteLoader/include/llapi/mc/ShulkerBoxBlockItem.hpp index d23e7fd41d..2350c198de 100644 --- a/LiteLoader/include/llapi/mc/ShulkerBoxBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerBoxBlockItem.hpp @@ -36,11 +36,6 @@ class ShulkerBoxBlockItem : public BlockItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class ShulkerBoxBlockItem : public BlockItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 45 * @symbol ?getLevelDataForAuxValue\@ShulkerBoxBlockItem\@\@UEBAHH\@Z @@ -121,6 +121,16 @@ class ShulkerBoxBlockItem : public BlockItem { * @symbol ?buildEffectDescriptionName\@ShulkerBoxBlockItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemStackBase\@\@\@Z */ virtual std::string buildEffectDescriptionName(class ItemStackBase const &) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); /** * @symbol ??0ShulkerBoxBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HPEBVBlock\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ShulkerBoxRecipe.hpp b/LiteLoader/include/llapi/mc/ShulkerBoxRecipe.hpp index 4dd43550c2..8e2c503a37 100644 --- a/LiteLoader/include/llapi/mc/ShulkerBoxRecipe.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerBoxRecipe.hpp @@ -37,9 +37,9 @@ class ShulkerBoxRecipe : public ShapelessRecipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@ShulkerBoxRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z + * @symbol ?assemble\@ShulkerBoxRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEAVCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; + virtual std::vector const & assemble(class CraftingContainer &, class CraftingContext &) const; /** * @vftbl 5 * @symbol __unk_vfn_5 @@ -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\@\@\@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\@\@Z */ - MCAPI ShulkerBoxRecipe(class std::basic_string_view>, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *); + MCAPI ShulkerBoxRecipe(class std::basic_string_view>, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional); /** * @symbol ?ID\@ShulkerBoxRecipe\@\@2VUUID\@mce\@\@B */ diff --git a/LiteLoader/include/llapi/mc/ShulkerBullet.hpp b/LiteLoader/include/llapi/mc/ShulkerBullet.hpp index e15cfb949f..38e393df4c 100644 --- a/LiteLoader/include/llapi/mc/ShulkerBullet.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerBullet.hpp @@ -42,135 +42,130 @@ class ShulkerBullet : public PredictableProjectile { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@ShulkerBullet\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 - */ - virtual void __unk_vfn_88(); - /** - * @vftbl 95 + * @vftbl 93 * @symbol ?isPickable\@ShulkerBullet\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_94(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_97(); /** - * @vftbl 104 + * @vftbl 102 * @symbol ?isOnFire\@ShulkerBullet\@\@UEBA_NXZ */ virtual bool isOnFire() const; + /** + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 169 + * @vftbl 167 * @symbol ?getSourceUniqueID\@ShulkerBullet\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@ShulkerBullet\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@ShulkerBullet\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** * @symbol ??0ShulkerBullet\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ShulkerUpdatePositionSystem.hpp b/LiteLoader/include/llapi/mc/ShulkerUpdatePositionSystem.hpp deleted file mode 100644 index 1d65cbb99b..0000000000 --- a/LiteLoader/include/llapi/mc/ShulkerUpdatePositionSystem.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file ShulkerUpdatePositionSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class ShulkerUpdatePositionSystem. - * - */ -class ShulkerUpdatePositionSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SHULKERUPDATEPOSITIONSYSTEM -public: - class ShulkerUpdatePositionSystem& operator=(class ShulkerUpdatePositionSystem const &) = delete; - ShulkerUpdatePositionSystem(class ShulkerUpdatePositionSystem const &) = delete; - ShulkerUpdatePositionSystem() = delete; -#endif - -public: - /** - * @symbol ?createShulkerUpdatePositionSystem\@ShulkerUpdatePositionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createShulkerUpdatePositionSystem(); - -}; diff --git a/LiteLoader/include/llapi/mc/SideBySideConstBlockSource.hpp b/LiteLoader/include/llapi/mc/SideBySideConstBlockSource.hpp index df10643f8b..68e2cddfaf 100644 --- a/LiteLoader/include/llapi/mc/SideBySideConstBlockSource.hpp +++ b/LiteLoader/include/llapi/mc/SideBySideConstBlockSource.hpp @@ -89,19 +89,19 @@ class SideBySideConstBlockSource { virtual class Material const & getMaterial(int, int, int) const; /** * @vftbl 12 - * @symbol __unk_vfn_12 + * @symbol ?hasChunksAt\@SideBySideConstBlockSource\@\@UEBA_NAEBUBounds\@\@_N\@Z */ - virtual void __unk_vfn_12(); + virtual bool hasChunksAt(struct Bounds const &, bool) const; /** * @vftbl 13 - * @symbol __unk_vfn_13 + * @symbol ?hasChunksAt\@SideBySideConstBlockSource\@\@UEBA_NAEBVBlockPos\@\@H_N\@Z */ - virtual void __unk_vfn_13(); + virtual bool hasChunksAt(class BlockPos const &, int, bool) const; /** * @vftbl 14 - * @symbol __unk_vfn_14 + * @symbol ?hasChunksAt\@SideBySideConstBlockSource\@\@UEBA_NAEBVAABB\@\@_N\@Z */ - virtual void __unk_vfn_14(); + virtual bool hasChunksAt(class AABB const &, bool) const; /** * @vftbl 15 * @symbol ?getDimensionId\@SideBySideConstBlockSource\@\@UEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ @@ -127,20 +127,6 @@ class SideBySideConstBlockSource { * @symbol ?getBrightness\@SideBySideConstBlockSource\@\@UEBAMAEBVBlockPos\@\@\@Z */ virtual float getBrightness(class BlockPos const &) const; -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SIDEBYSIDECONSTBLOCKSOURCE - /** - * @symbol ?hasChunksAt\@SideBySideConstBlockSource\@\@UEBA_NAEBUBounds\@\@_N\@Z - */ - MCVAPI bool hasChunksAt(struct Bounds const &, bool) const; - /** - * @symbol ?hasChunksAt\@SideBySideConstBlockSource\@\@UEBA_NAEBVAABB\@\@_N\@Z - */ - MCVAPI bool hasChunksAt(class AABB const &, bool) const; - /** - * @symbol ?hasChunksAt\@SideBySideConstBlockSource\@\@UEBA_NAEBVBlockPos\@\@H_N\@Z - */ - MCVAPI bool hasChunksAt(class BlockPos const &, int, bool) const; -#endif /** * @symbol ??0SideBySideConstBlockSource\@\@QEAA\@V?$not_null\@PEBUAccessedBlockSourceBlocks\@\@\@gsl\@\@_K\@Z */ diff --git a/LiteLoader/include/llapi/mc/SideBySideExtractionSystem.hpp b/LiteLoader/include/llapi/mc/SideBySideExtractionSystem.hpp index 254519a505..0a16b23ac6 100644 --- a/LiteLoader/include/llapi/mc/SideBySideExtractionSystem.hpp +++ b/LiteLoader/include/llapi/mc/SideBySideExtractionSystem.hpp @@ -39,9 +39,9 @@ class SideBySideExtractionSystem { */ virtual void registerEvents(class entt::basic_dispatcher> &); /** - * @symbol ??0SideBySideExtractionSystem\@\@QEAA\@AEBV?$array\@V?$vector\@IV?$allocator\@I\@std\@\@\@std\@\@$0BE\@\@std\@\@\@Z + * @symbol ??0SideBySideExtractionSystem\@\@QEAA\@AEBV?$array\@V?$vector\@IV?$allocator\@I\@std\@\@\@std\@\@$0M\@\@std\@\@\@Z */ - MCAPI SideBySideExtractionSystem(class std::array, 20> const &); + MCAPI SideBySideExtractionSystem(class std::array, 12> const &); /** * @symbol ?_onSideBySideExtractionRequest\@SideBySideExtractionSystem\@\@SAXAEBUExtractMethods\@SideBySide\@\@AEBUOnExtractSideBySide\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SideBySidePlaybackBlocksComponent.hpp b/LiteLoader/include/llapi/mc/SideBySidePlaybackBlocksComponent.hpp index b736af7605..c2cafca3db 100644 --- a/LiteLoader/include/llapi/mc/SideBySidePlaybackBlocksComponent.hpp +++ b/LiteLoader/include/llapi/mc/SideBySidePlaybackBlocksComponent.hpp @@ -22,11 +22,14 @@ struct SideBySidePlaybackBlocksComponent { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIDEBYSIDEPLAYBACKBLOCKSCOMPONENT public: struct SideBySidePlaybackBlocksComponent& operator=(struct SideBySidePlaybackBlocksComponent const &) = delete; - SideBySidePlaybackBlocksComponent(struct SideBySidePlaybackBlocksComponent const &) = delete; SideBySidePlaybackBlocksComponent() = delete; #endif public: + /** + * @symbol ??0SideBySidePlaybackBlocksComponent\@\@QEAA\@AEBU0\@\@Z + */ + MCAPI SideBySidePlaybackBlocksComponent(struct SideBySidePlaybackBlocksComponent const &); /** * @symbol ??4SideBySidePlaybackBlocksComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SideBySideTrigger.hpp b/LiteLoader/include/llapi/mc/SideBySideTrigger.hpp index b41d5e1bfb..8f2d52f402 100644 --- a/LiteLoader/include/llapi/mc/SideBySideTrigger.hpp +++ b/LiteLoader/include/llapi/mc/SideBySideTrigger.hpp @@ -35,10 +35,6 @@ class SideBySideTrigger { * @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 ?isTriggered\@SideBySideTrigger\@\@SA_NAEAUIActorMovementProxy\@\@W4SideBySideExtractionId\@\@\@Z - */ - MCAPI static bool isTriggered(struct IActorMovementProxy &, enum class SideBySideExtractionId); /** * @symbol ?shouldSimulateLegacy\@SideBySideTrigger\@\@SA_NAEBUIActorMovementProxy\@\@W4SideBySideExtractionId\@\@\@Z */ @@ -59,14 +55,14 @@ class SideBySideTrigger { * @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_NAEAUIActorMovementProxy\@\@W4SideBySideExtractionId\@\@W4SideBySideExtractionStep\@\@\@Z - */ - MCAPI static bool tryTrigger(struct IActorMovementProxy &, enum class SideBySideExtractionId, enum class SideBySideExtractionStep); /** * @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 */ diff --git a/LiteLoader/include/llapi/mc/SignBlock.hpp b/LiteLoader/include/llapi/mc/SignBlock.hpp index 9b68c6df36..c44a388521 100644 --- a/LiteLoader/include/llapi/mc/SignBlock.hpp +++ b/LiteLoader/include/llapi/mc/SignBlock.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "SignBlockActor.hpp" #include "ActorBlock.hpp" #define BEFORE_EXTRA @@ -21,7 +20,9 @@ class SignBlock : public ActorBlock { #define AFTER_EXTRA // Add Member There - +public: + struct SignInteractionResult; + enum class SignType; #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIGNBLOCK public: @@ -46,16 +47,21 @@ class SignBlock : public ActorBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -67,10 +73,10 @@ class SignBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -102,10 +108,10 @@ class SignBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -132,173 +138,195 @@ class SignBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 69 + * @vftbl 68 * @symbol ?checkIsPathable\@SignBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 91 + * @vftbl 90 * @symbol ?mayPlace\@SignBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@SignBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@SignBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@SignBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@SignBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@SignBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@SignBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 195 + * @vftbl 188 + * @symbol ?getResourceItem\@SignBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + */ + virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + /** + * @vftbl 194 * @symbol ?getEntityResourceItem\@SignBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z */ virtual class ItemInstance getEntityResourceItem(class Randomize &, class BlockActor const &, int) const; /** - * @vftbl 196 + * @vftbl 195 * @symbol ?getYRotationInDegrees\@SignBlock\@\@UEBAMAEBVBlock\@\@\@Z */ virtual float getYRotationInDegrees(class Block const &) const; /** - * @vftbl 197 + * @vftbl 196 * @symbol ?_canSurvive\@SignBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool _canSurvive(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 198 + * @vftbl 197 * @symbol ?_getItemInstance\@SignBlock\@\@MEBA?AVItemInstance\@\@XZ */ virtual class ItemInstance _getItemInstance() const; /** - * @vftbl 199 + * @vftbl 198 * @symbol ?_getShape\@SignBlock\@\@MEBAXHAEAVAABB\@\@\@Z */ virtual void _getShape(int, class AABB &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SIGNBLOCK /** - * @symbol ??0SignBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_NW4SignType\@SignBlockActor\@\@\@Z + * @symbol ?isInteractiveBlock\@SignBlock\@\@UEBA_NXZ */ - MCAPI SignBlock(std::string const &, int, bool, enum class SignBlockActor::SignType); + MCVAPI bool isInteractiveBlock() const; +#endif + /** + * @symbol ??0SignBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_NW4SignType\@0\@\@Z + */ + MCAPI SignBlock(std::string const &, int, bool, enum class SignBlock::SignType); + /** + * @symbol ?getSignTextColorFromDyeItem\@SignBlock\@\@SA?AVColor\@mce\@\@AEBVItem\@\@\@Z + */ + MCAPI static class mce::Color getSignTextColorFromDyeItem(class Item const &); + +//private: + /** + * @symbol ?_canChangeSign\@SignBlock\@\@CA_NAEAVSignBlockActor\@\@AEAVPlayer\@\@\@Z + */ + MCAPI static bool _canChangeSign(class SignBlockActor &, class Player &); + /** + * @symbol ?_getInteractResult\@SignBlock\@\@CA?AUSignInteractionResult\@1\@AEAVSignBlockActor\@\@W4SignTextSide\@\@AEAVItemStack\@\@AEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + */ + MCAPI static struct SignBlock::SignInteractionResult _getInteractResult(class SignBlockActor &, enum class SignTextSide, class ItemStack &, class Player &, class BlockPos const &, unsigned char); + +private: }; diff --git a/LiteLoader/include/llapi/mc/SignBlockActor.hpp b/LiteLoader/include/llapi/mc/SignBlockActor.hpp index d07f0a2448..433ec68642 100644 --- a/LiteLoader/include/llapi/mc/SignBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/SignBlockActor.hpp @@ -104,21 +104,31 @@ enum class SignType; virtual void __unk_vfn_35(); /** * @vftbl 36 - * @symbol __unk_vfn_36 + * @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 void __unk_vfn_36(); + virtual std::vector getUgcStrings(class CompoundTag const &) const; /** * @vftbl 37 + * @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 + */ + virtual void __unk_vfn_38(); + /** + * @vftbl 39 * @symbol ?_getUpdatePacket\@SignBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 38 + * @vftbl 40 * @symbol ?_onUpdatePacket\@SignBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @vftbl 39 + * @vftbl 41 * @symbol ?_playerCanUpdate\@SignBlockActor\@\@MEBA_NAEBVPlayer\@\@\@Z */ virtual bool _playerCanUpdate(class Player const &) const; @@ -168,6 +178,10 @@ enum class SignType; * @symbol ?serverOnlySetIsLockedForEditing\@SignBlockActor\@\@QEAAXAEAVPlayer\@\@\@Z */ MCAPI void serverOnlySetIsLockedForEditing(class Player &); + /** + * @symbol ?setHideGlowOutline\@SignBlockActor\@\@QEAAXW4SignTextSide\@\@_N\@Z + */ + MCAPI void setHideGlowOutline(enum class SignTextSide, bool); /** * @symbol ?setIsGlowing\@SignBlockActor\@\@QEAAXW4SignTextSide\@\@_N\@Z */ @@ -184,10 +198,6 @@ enum class SignType; * @symbol ?setSignTextColor\@SignBlockActor\@\@QEAAXW4SignTextSide\@\@AEBVColor\@mce\@\@\@Z */ MCAPI void setSignTextColor(enum class SignTextSide, class mce::Color const &); - /** - * @symbol ?setType\@SignBlockActor\@\@QEAAXW4SignType\@1\@\@Z - */ - MCAPI void setType(enum class SignBlockActor::SignType); /** * @symbol ?setWaxed\@SignBlockActor\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/SignItem.hpp b/LiteLoader/include/llapi/mc/SignItem.hpp index 7969876ac2..d79abba55f 100644 --- a/LiteLoader/include/llapi/mc/SignItem.hpp +++ b/LiteLoader/include/llapi/mc/SignItem.hpp @@ -6,7 +6,7 @@ #define AUTO_GENERATED #include "llapi/Global.h" #include "Json.hpp" -#include "SignBlockActor.hpp" +#include "SignBlock.hpp" #include "Item.hpp" #define BEFORE_EXTRA @@ -37,11 +37,6 @@ class SignItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -57,6 +52,11 @@ class SignItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -103,25 +103,30 @@ class SignItem : public Item { */ virtual void __unk_vfn_80(); /** - * @vftbl 131 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 133 * @symbol ?_calculatePlacePos\@SignItem\@\@EEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 132 + * @vftbl 134 * @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 133 - * @symbol ?getBlockToPlace\@SignItem\@\@MEBAPEBVBlock\@\@EAEBVActor\@\@VBlockPos\@\@\@Z + * @vftbl 135 + * @symbol ?getBlockToPlace\@SignItem\@\@UEBAPEBVBlock\@\@EAEBVActor\@\@VBlockPos\@\@\@Z */ virtual class Block const * getBlockToPlace(unsigned char, class Actor const &, class BlockPos) const; - /** - * @vftbl 134 - * @symbol ?_initializeTags\@SignItem\@\@EEAAXXZ - */ - virtual void _initializeTags(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SIGNITEM /** * @symbol __unk_destructor_-1 @@ -129,8 +134,8 @@ class SignItem : public Item { MCVAPI ~SignItem(); #endif /** - * @symbol ??0SignItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4SignType\@SignBlockActor\@\@\@Z + * @symbol ??0SignItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4SignType\@SignBlock\@\@\@Z */ - MCAPI SignItem(std::string const &, int, enum class SignBlockActor::SignType); + MCAPI SignItem(std::string const &, int, enum class SignBlock::SignType); }; diff --git a/LiteLoader/include/llapi/mc/SignalServiceSigninJob.hpp b/LiteLoader/include/llapi/mc/SignalServiceSigninJob.hpp new file mode 100644 index 0000000000..ddffa5311f --- /dev/null +++ b/LiteLoader/include/llapi/mc/SignalServiceSigninJob.hpp @@ -0,0 +1,48 @@ +/** + * @file SignalServiceSigninJob.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class SignalServiceSigninJob { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIGNALSERVICESIGNINJOB +public: + class SignalServiceSigninJob& operator=(class SignalServiceSigninJob const &) = delete; + SignalServiceSigninJob(class SignalServiceSigninJob const &) = delete; + SignalServiceSigninJob() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?signin\@SignalServiceSigninJob\@\@UEAAX_N\@Z + */ + virtual void signin(bool); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SIGNALSERVICESIGNINJOB + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~SignalServiceSigninJob(); +#endif + /** + * @symbol ??0SignalServiceSigninJob\@\@QEAA\@$$QEAV?$function\@$$A6AX_N\@Z\@std\@\@$$QEAV?$function\@$$A6AXXZ\@2\@\@Z + */ + MCAPI SignalServiceSigninJob(class std::function &&, class std::function &&); + +}; diff --git a/LiteLoader/include/llapi/mc/Silverfish.hpp b/LiteLoader/include/llapi/mc/Silverfish.hpp index c077bd4bba..7cb6c0bbc5 100644 --- a/LiteLoader/include/llapi/mc/Silverfish.hpp +++ b/LiteLoader/include/llapi/mc/Silverfish.hpp @@ -37,152 +37,147 @@ class Silverfish : public Monster { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 141 + * @vftbl 139 * @symbol ?handleEntityEvent\@Silverfish\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 266 + * @vftbl 258 * @symbol ?_playStepSound\@Silverfish\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 277 + * @vftbl 269 * @symbol ?spawnAnim\@Silverfish\@\@UEAAXXZ */ virtual void spawnAnim(); /** - * @vftbl 293 + * @vftbl 285 * @symbol ?checkSpawnRules\@Silverfish\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 337 + * @vftbl 329 * @symbol ?_getWalkTargetValue\@Silverfish\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** - * @vftbl 353 + * @vftbl 345 * @symbol ?isDarkEnoughToSpawn\@Silverfish\@\@UEBA_NXZ */ virtual bool isDarkEnoughToSpawn() const; diff --git a/LiteLoader/include/llapi/mc/SimpleBlockVolume.hpp b/LiteLoader/include/llapi/mc/SimpleBlockVolume.hpp new file mode 100644 index 0000000000..ecca58ff58 --- /dev/null +++ b/LiteLoader/include/llapi/mc/SimpleBlockVolume.hpp @@ -0,0 +1,122 @@ +/** + * @file SimpleBlockVolume.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class SimpleBlockVolume { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIMPLEBLOCKVOLUME +public: + SimpleBlockVolume() = delete; +#endif + +public: + /** + * @symbol ??0SimpleBlockVolume\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI SimpleBlockVolume(class SimpleBlockVolume const &); + /** + * @symbol ??0SimpleBlockVolume\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI SimpleBlockVolume(class SimpleBlockVolume &&); + /** + * @symbol ?begin\@SimpleBlockVolume\@\@QEBA?AVSimpleBlockVolumeIterator\@\@XZ + */ + MCAPI class SimpleBlockVolumeIterator begin() const; + /** + * @symbol ?contains\@SimpleBlockVolume\@\@QEBA_NAEBVBlockPos\@\@\@Z + */ + MCAPI bool contains(class BlockPos const &) const; + /** + * @symbol ?doesAreaTouchFaces\@SimpleBlockVolume\@\@QEBA_NAEBVBlockPos\@\@0\@Z + */ + MCAPI bool doesAreaTouchFaces(class BlockPos const &, class BlockPos const &) const; + /** + * @symbol ?doesBlockTouchFaces\@SimpleBlockVolume\@\@QEBA_NAEBVBlockPos\@\@\@Z + */ + MCAPI bool doesBlockTouchFaces(class BlockPos const &) const; + /** + * @symbol ?getBoundingBox\@SimpleBlockVolume\@\@QEBA?AVBoundingBox\@\@XZ + */ + MCAPI class BoundingBox getBoundingBox() const; + /** + * @symbol ?getCapacity\@SimpleBlockVolume\@\@QEBAHXZ + */ + MCAPI int getCapacity() const; + /** + * @symbol ?getFrom\@SimpleBlockVolume\@\@QEBA?AVBlockPos\@\@XZ + */ + MCAPI class BlockPos getFrom() const; + /** + * @symbol ?getMax\@SimpleBlockVolume\@\@QEBA?AVBlockPos\@\@XZ + */ + MCAPI class BlockPos getMax() const; + /** + * @symbol ?getMin\@SimpleBlockVolume\@\@QEBA?AVBlockPos\@\@XZ + */ + MCAPI class BlockPos getMin() const; + /** + * @symbol ?getSpan\@SimpleBlockVolume\@\@QEBA?AU?$vec\@$02H$0A\@\@glm\@\@XZ + */ + MCAPI struct glm::vec<3, int, 0> getSpan() const; + /** + * @symbol ?getTo\@SimpleBlockVolume\@\@QEBA?AVBlockPos\@\@XZ + */ + MCAPI class BlockPos getTo() const; + /** + * @symbol ?getWorldAABB\@SimpleBlockVolume\@\@QEBA?AVAABB\@\@XZ + */ + MCAPI class AABB getWorldAABB() const; + /** + * @symbol ?intersects\@SimpleBlockVolume\@\@QEBA?AW4IntersectionResult\@1\@AEBV1\@\@Z + */ + MCAPI enum class SimpleBlockVolume::IntersectionResult intersects(class SimpleBlockVolume const &) const; + /** + * @symbol ??4SimpleBlockVolume\@\@QEAAAEAV0\@AEBV0\@\@Z + */ + MCAPI class SimpleBlockVolume & operator=(class SimpleBlockVolume const &); + /** + * @symbol ??4SimpleBlockVolume\@\@QEAAAEAV0\@$$QEAV0\@\@Z + */ + MCAPI class SimpleBlockVolume & operator=(class SimpleBlockVolume &&); + /** + * @symbol ??8SimpleBlockVolume\@\@QEBA_NAEBV0\@\@Z + */ + MCAPI bool operator==(class SimpleBlockVolume const &) const; + /** + * @symbol ?translate\@SimpleBlockVolume\@\@QEAAAEAV1\@AEBU?$vec\@$02H$0A\@\@glm\@\@\@Z + */ + MCAPI class SimpleBlockVolume & translate(struct glm::vec<3, int, 0> const &); + /** + * @symbol ?translated\@SimpleBlockVolume\@\@QEBA?AV1\@AEBU?$vec\@$02H$0A\@\@glm\@\@\@Z + */ + MCAPI class SimpleBlockVolume translated(struct glm::vec<3, int, 0> const &) const; + /** + * @symbol ?cerealBindTypes\@SimpleBlockVolume\@\@SAXXZ + */ + MCAPI static void cerealBindTypes(); + +//protected: + /** + * @symbol ?_setFrom\@SimpleBlockVolume\@\@IEAAXAEBVVec3\@\@\@Z + */ + MCAPI void _setFrom(class Vec3 const &); + /** + * @symbol ?_setTo\@SimpleBlockVolume\@\@IEAAXAEBVVec3\@\@\@Z + */ + MCAPI void _setTo(class Vec3 const &); + +protected: + +}; diff --git a/LiteLoader/include/llapi/mc/SimpleBlockVolumeIterator.hpp b/LiteLoader/include/llapi/mc/SimpleBlockVolumeIterator.hpp new file mode 100644 index 0000000000..e09e7c5b70 --- /dev/null +++ b/LiteLoader/include/llapi/mc/SimpleBlockVolumeIterator.hpp @@ -0,0 +1,38 @@ +/** + * @file SimpleBlockVolumeIterator.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "BaseBlockLocationIterator.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class SimpleBlockVolumeIterator : public BaseBlockLocationIterator { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIMPLEBLOCKVOLUMEITERATOR +public: + class SimpleBlockVolumeIterator& operator=(class SimpleBlockVolumeIterator const &) = delete; + SimpleBlockVolumeIterator(class SimpleBlockVolumeIterator const &) = delete; + SimpleBlockVolumeIterator() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @symbol ??0SimpleBlockVolumeIterator\@\@QEAA\@AEBVSimpleBlockVolume\@\@_N\@Z + */ + MCAPI SimpleBlockVolumeIterator(class SimpleBlockVolume const &, bool); + +}; diff --git a/LiteLoader/include/llapi/mc/SimpleContainer.hpp b/LiteLoader/include/llapi/mc/SimpleContainer.hpp index d0f340bbe4..59e5c687ff 100644 --- a/LiteLoader/include/llapi/mc/SimpleContainer.hpp +++ b/LiteLoader/include/llapi/mc/SimpleContainer.hpp @@ -51,35 +51,35 @@ class SimpleContainer : public Container { */ virtual void setItem(int, class ItemStack const &); /** - * @vftbl 15 + * @vftbl 16 * @symbol ?getContainerSize\@SimpleContainer\@\@UEBAHXZ */ virtual int getContainerSize() const; /** - * @vftbl 16 + * @vftbl 17 * @symbol ?getMaxStackSize\@SimpleContainer\@\@UEBAHXZ */ virtual int getMaxStackSize() const; /** - * @vftbl 17 + * @vftbl 18 * @symbol ?startOpen\@SimpleContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void startOpen(class Player &); /** - * @vftbl 18 + * @vftbl 19 * @symbol ?stopOpen\@SimpleContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void stopOpen(class Player &); - /** - * @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(); /** * @symbol ??0SimpleContainer\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NHW4ContainerType\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SimpleEventPacket.hpp b/LiteLoader/include/llapi/mc/SimpleEventPacket.hpp index 11ad5fa9c2..8c4aeee209 100644 --- a/LiteLoader/include/llapi/mc/SimpleEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/SimpleEventPacket.hpp @@ -53,23 +53,23 @@ enum class Subtype; virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SimpleEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SimpleEventPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SIMPLEEVENTPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~SimpleEventPacket(); #endif - /** - * @symbol ??0SimpleEventPacket\@\@QEAA\@XZ - */ - MCAPI SimpleEventPacket(); /** * @symbol ??0SimpleEventPacket\@\@QEAA\@AEBW4Subtype\@0\@\@Z */ MCAPI SimpleEventPacket(enum class SimpleEventPacket::Subtype const &); + /** + * @symbol ??0SimpleEventPacket\@\@QEAA\@XZ + */ + MCAPI SimpleEventPacket(); /** * @symbol ?getSubtype\@SimpleEventPacket\@\@QEBAAEBW4Subtype\@1\@XZ */ diff --git a/LiteLoader/include/llapi/mc/SimplePlayerContainer.hpp b/LiteLoader/include/llapi/mc/SimplePlayerContainer.hpp index e704ab996a..60a2c2ad81 100644 --- a/LiteLoader/include/llapi/mc/SimplePlayerContainer.hpp +++ b/LiteLoader/include/llapi/mc/SimplePlayerContainer.hpp @@ -40,16 +40,16 @@ class SimplePlayerContainer : public SimpleContainer { * @symbol ?setItem\@SimplePlayerContainer\@\@UEAAXHAEBVItemStack\@\@\@Z */ virtual void setItem(int, class ItemStack const &); - /** - * @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(); /** * @symbol ??0SimplePlayerContainer\@\@QEAA\@AEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NHW4ContainerType\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SimulatedPlayer.hpp b/LiteLoader/include/llapi/mc/SimulatedPlayer.hpp index 0ae41adc9d..d6421de60e 100644 --- a/LiteLoader/include/llapi/mc/SimulatedPlayer.hpp +++ b/LiteLoader/include/llapi/mc/SimulatedPlayer.hpp @@ -56,237 +56,232 @@ class SimulatedPlayer : public ServerPlayer { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 44 + * @vftbl 43 * @symbol ?teleportTo\@SimulatedPlayer\@\@UEAAXAEBVVec3\@\@_NHH1\@Z */ virtual void teleportTo(class Vec3 const &, bool, int, int, bool); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_267(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 - */ - virtual void __unk_vfn_275(); - /** - * @vftbl 288 + * @vftbl 280 * @symbol ?aiStep\@SimulatedPlayer\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); + /** + * @vftbl 353 + * @symbol __unk_vfn_353 + */ + virtual void __unk_vfn_353(); + /** + * @vftbl 360 + * @symbol __unk_vfn_360 + */ + virtual void __unk_vfn_360(); /** * @vftbl 361 * @symbol __unk_vfn_361 */ virtual void __unk_vfn_361(); /** - * @vftbl 368 - * @symbol __unk_vfn_368 + * @vftbl 363 + * @symbol __unk_vfn_363 + */ + virtual void __unk_vfn_363(); + /** + * @vftbl 364 + * @symbol __unk_vfn_364 */ - virtual void __unk_vfn_368(); + virtual void __unk_vfn_364(); /** * @vftbl 369 * @symbol __unk_vfn_369 */ virtual void __unk_vfn_369(); /** - * @vftbl 371 - * @symbol __unk_vfn_371 + * @vftbl 370 + * @symbol __unk_vfn_370 + */ + virtual void __unk_vfn_370(); + /** + * @vftbl 373 + * @symbol __unk_vfn_373 */ - virtual void __unk_vfn_371(); + virtual void __unk_vfn_373(); /** - * @vftbl 372 - * @symbol __unk_vfn_372 + * @vftbl 376 + * @symbol __unk_vfn_376 */ - virtual void __unk_vfn_372(); + virtual void __unk_vfn_376(); /** * @vftbl 377 * @symbol __unk_vfn_377 */ virtual void __unk_vfn_377(); /** - * @vftbl 378 - * @symbol __unk_vfn_378 - */ - virtual void __unk_vfn_378(); - /** - * @vftbl 381 - * @symbol __unk_vfn_381 - */ - virtual void __unk_vfn_381(); - /** - * @vftbl 384 - * @symbol __unk_vfn_384 - */ - virtual void __unk_vfn_384(); - /** - * @vftbl 385 - * @symbol __unk_vfn_385 - */ - virtual void __unk_vfn_385(); - /** - * @vftbl 396 - * @symbol __unk_vfn_396 + * @vftbl 388 + * @symbol __unk_vfn_388 */ - virtual void __unk_vfn_396(); + virtual void __unk_vfn_388(); /** - * @vftbl 397 + * @vftbl 389 * @symbol ?isHostingPlayer\@SimulatedPlayer\@\@UEBA_NXZ */ virtual bool isHostingPlayer() const; /** - * @vftbl 400 - * @symbol __unk_vfn_400 + * @vftbl 392 + * @symbol __unk_vfn_392 */ - virtual void __unk_vfn_400(); + virtual void __unk_vfn_392(); /** - * @vftbl 407 - * @symbol __unk_vfn_407 + * @vftbl 399 + * @symbol __unk_vfn_399 */ - virtual void __unk_vfn_407(); + virtual void __unk_vfn_399(); /** - * @vftbl 433 - * @symbol __unk_vfn_433 + * @vftbl 422 + * @symbol __unk_vfn_422 */ - virtual void __unk_vfn_433(); + virtual void __unk_vfn_422(); /** - * @vftbl 434 + * @vftbl 423 * @symbol ?getXuid\@SimulatedPlayer\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getXuid() const; /** - * @vftbl 435 + * @vftbl 424 * @symbol ?getMovementSettings\@SimulatedPlayer\@\@UEBAAEBUPlayerMovementSettings\@\@XZ */ virtual struct PlayerMovementSettings const & getMovementSettings() const; /** - * @vftbl 436 - * @symbol __unk_vfn_436 + * @vftbl 425 + * @symbol __unk_vfn_425 */ - virtual void __unk_vfn_436(); + virtual void __unk_vfn_425(); /** - * @vftbl 439 + * @vftbl 428 * @symbol ?_createChunkSource\@SimulatedPlayer\@\@MEAA?AV?$shared_ptr\@VChunkViewSource\@\@\@std\@\@AEAVChunkSource\@\@\@Z */ virtual class std::shared_ptr _createChunkSource(class ChunkSource &); /** - * @vftbl 443 + * @vftbl 432 * @symbol ?_getSpawnChunkLimit\@SimulatedPlayer\@\@MEBAHXZ */ virtual int _getSpawnChunkLimit() const; /** - * @vftbl 444 + * @vftbl 433 * @symbol ?_updateChunkPublisherView\@SimulatedPlayer\@\@MEAAXAEBVVec3\@\@M\@Z */ virtual void _updateChunkPublisherView(class Vec3 const &, float); @@ -341,17 +336,17 @@ class SimulatedPlayer : public ServerPlayer { */ MCAPI bool simulateGiveItem(class ItemStack &, bool); /** - * @symbol ?simulateInteract\@SimulatedPlayer\@\@QEAA_NXZ + * @symbol ?simulateInteract\@SimulatedPlayer\@\@QEAA_NAEAVActor\@\@\@Z */ - MCAPI bool simulateInteract(); + MCAPI bool simulateInteract(class Actor &); /** * @symbol ?simulateInteract\@SimulatedPlayer\@\@QEAA_NAEBVBlockPos\@\@W4ScriptFacing\@ScriptModuleMinecraft\@\@\@Z */ MCAPI bool simulateInteract(class BlockPos const &, enum class ScriptModuleMinecraft::ScriptFacing); /** - * @symbol ?simulateInteract\@SimulatedPlayer\@\@QEAA_NAEAVActor\@\@\@Z + * @symbol ?simulateInteract\@SimulatedPlayer\@\@QEAA_NXZ */ - MCAPI bool simulateInteract(class Actor &); + MCAPI bool simulateInteract(); /** * @symbol ?simulateJump\@SimulatedPlayer\@\@QEAA_NXZ */ @@ -360,6 +355,10 @@ 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 */ @@ -368,10 +367,6 @@ 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 */ diff --git a/LiteLoader/include/llapi/mc/SimulationTypePacket.hpp b/LiteLoader/include/llapi/mc/SimulationTypePacket.hpp index 31ec27f3b6..595d202807 100644 --- a/LiteLoader/include/llapi/mc/SimulationTypePacket.hpp +++ b/LiteLoader/include/llapi/mc/SimulationTypePacket.hpp @@ -51,9 +51,9 @@ class SimulationTypePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SimulationTypePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SimulationTypePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0SimulationTypePacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/Skeleton.hpp b/LiteLoader/include/llapi/mc/Skeleton.hpp index a4ed1ad8bc..42e90bec65 100644 --- a/LiteLoader/include/llapi/mc/Skeleton.hpp +++ b/LiteLoader/include/llapi/mc/Skeleton.hpp @@ -37,160 +37,155 @@ class Skeleton : public HumanoidMonster { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@Skeleton\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 114 + * @vftbl 112 * @symbol ?setTarget\@Skeleton\@\@UEAAXPEAVActor\@\@\@Z */ virtual void setTarget(class Actor *); /** - * @vftbl 171 + * @vftbl 169 * @symbol ?canFreeze\@Skeleton\@\@UEBA_NXZ */ virtual bool canFreeze() const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 207 + * @vftbl 205 * @symbol ?canBeAffected\@Skeleton\@\@UEBA_NI\@Z */ virtual bool canBeAffected(unsigned int) const; /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 219 + * @vftbl 217 * @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 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 245 + * @vftbl 237 * @symbol ?die\@Skeleton\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); + /** + * @vftbl 252 + * @symbol __unk_vfn_252 + */ + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); - /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 304 + * @vftbl 296 * @symbol ?doHurtTarget\@Skeleton\@\@UEAA_NPEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z */ virtual bool doHurtTarget(class Actor *, enum class ActorDamageCause const &); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0Skeleton\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SkullBlock.hpp b/LiteLoader/include/llapi/mc/SkullBlock.hpp index 51e2fac5b1..6ff3855b6f 100644 --- a/LiteLoader/include/llapi/mc/SkullBlock.hpp +++ b/LiteLoader/include/llapi/mc/SkullBlock.hpp @@ -45,16 +45,21 @@ class SkullBlock : public ActorBlock { * @symbol ?canProvideSupport\@SkullBlock\@\@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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class SkullBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class SkullBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,15 +136,15 @@ class SkullBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -147,131 +152,126 @@ class SkullBlock : public ActorBlock { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@SkullBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@SkullBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@SkullBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@SkullBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 144 + * @vftbl 142 * @symbol ?getVisualShape\@SkullBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@SkullBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 195 + * @vftbl 194 * @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 3653bd8958..44f4337b42 100644 --- a/LiteLoader/include/llapi/mc/SkullBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/SkullBlockActor.hpp @@ -93,17 +93,17 @@ enum class SkullType; */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); /** - * @vftbl 37 + * @vftbl 39 * @symbol ?_getUpdatePacket\@SkullBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 38 + * @vftbl 40 * @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 6dec289176..1190fbf208 100644 --- a/LiteLoader/include/llapi/mc/SkullItem.hpp +++ b/LiteLoader/include/llapi/mc/SkullItem.hpp @@ -36,11 +36,6 @@ class SkullItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class SkullItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 42 * @symbol ?getBlockShape\@SkullItem\@\@UEBA?AW4BlockShape\@\@XZ @@ -142,22 +142,32 @@ class SkullItem : public Item { */ virtual enum class LevelSoundEvent getEquipSound() const; /** - * @vftbl 118 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 120 * @symbol ?getIconInfo\@SkullItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 129 + * @vftbl 131 * @symbol ?getAuxValuesDescription\@SkullItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getAuxValuesDescription() const; /** - * @vftbl 131 + * @vftbl 133 * @symbol ?_calculatePlacePos\@SkullItem\@\@EEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 132 + * @vftbl 134 * @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 88c6c34c8a..181cca17e2 100644 --- a/LiteLoader/include/llapi/mc/SlabBlock.hpp +++ b/LiteLoader/include/llapi/mc/SlabBlock.hpp @@ -50,16 +50,21 @@ class SlabBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -71,10 +76,10 @@ class SlabBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -107,14 +112,14 @@ class SlabBlock : public BlockLegacy { virtual void __unk_vfn_41(); /** * @vftbl 42 - * @symbol __unk_vfn_42 + * @symbol ?isDoubleSlabBlock\@SlabBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_42(); + virtual bool isDoubleSlabBlock() const; /** * @vftbl 43 - * @symbol ?isDoubleSlabBlock\@SlabBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_43 */ - virtual bool isDoubleSlabBlock() const; + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -141,147 +146,142 @@ class SlabBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 69 + * @vftbl 68 * @symbol ?checkIsPathable\@SlabBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 80 + * @vftbl 79 * @symbol ?getRedstoneProperty\@SlabBlock\@\@UEBA?AW4BlockProperty\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockProperty getRedstoneProperty(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 96 + * @vftbl 95 * @symbol ?breaksFallingBlocks\@SlabBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@SlabBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 121 + * @vftbl 120 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@SlabBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@SlabBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @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 0f69d5d762..47dfb27179 100644 --- a/LiteLoader/include/llapi/mc/SlabBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/SlabBlockItem.hpp @@ -36,11 +36,6 @@ class SlabBlockItem : public BlockItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class SlabBlockItem : public BlockItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -102,12 +102,22 @@ class SlabBlockItem : public BlockItem { */ virtual void __unk_vfn_80(); /** - * @vftbl 131 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 133 * @symbol ?_calculatePlacePos\@SlabBlockItem\@\@UEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 132 + * @vftbl 134 * @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 8e986ff70d..73012a0861 100644 --- a/LiteLoader/include/llapi/mc/Slime.hpp +++ b/LiteLoader/include/llapi/mc/Slime.hpp @@ -47,197 +47,192 @@ class Slime : public Monster { */ virtual void remove(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 80 + * @vftbl 78 * @symbol ?getShadowRadius\@Slime\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 187 + * @vftbl 185 * @symbol ?onSynchedDataUpdate\@Slime\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@Slime\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@Slime\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 288 + * @vftbl 280 * @symbol ?aiStep\@Slime\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 293 + * @vftbl 285 * @symbol ?checkSpawnRules\@Slime\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 337 + * @vftbl 329 * @symbol ?_getWalkTargetValue\@Slime\@\@MEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** - * @vftbl 354 + * @vftbl 346 * @symbol ?getSquishSound\@Slime\@\@UEAA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getSquishSound(); /** - * @vftbl 355 + * @vftbl 347 * @symbol ?setSlimeSize\@Slime\@\@MEAAXH\@Z */ virtual void setSlimeSize(int); /** - * @vftbl 356 + * @vftbl 348 * @symbol ?doPlayJumpSound\@Slime\@\@MEAA_NXZ */ virtual bool doPlayJumpSound(); /** - * @vftbl 357 + * @vftbl 349 * @symbol ?doPlayLandSound\@Slime\@\@MEAA_NXZ */ virtual bool doPlayLandSound(); /** - * @vftbl 358 + * @vftbl 350 * @symbol ?playJumpSound\@Slime\@\@MEAAXXZ */ virtual void playJumpSound(); /** - * @vftbl 359 + * @vftbl 351 * @symbol ?playLandSound\@Slime\@\@MEAAXXZ */ virtual void playLandSound(); /** - * @vftbl 360 + * @vftbl 352 * @symbol ?decreaseSquish\@Slime\@\@MEAAXXZ */ virtual void decreaseSquish(); /** - * @vftbl 361 + * @vftbl 353 * @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 3e9d20eb7f..22a28e4029 100644 --- a/LiteLoader/include/llapi/mc/SlimeBlock.hpp +++ b/LiteLoader/include/llapi/mc/SlimeBlock.hpp @@ -40,16 +40,21 @@ class SlimeBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class SlimeBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class SlimeBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,125 +131,120 @@ class SlimeBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 80 + * @symbol ?updateEntityAfterFallOn\@SlimeBlock\@\@UEBAXAEBVBlockPos\@\@AEAUUpdateEntityAfterFallOnInterface\@\@\@Z */ - virtual void __unk_vfn_75(); + virtual void updateEntityAfterFallOn(class BlockPos const &, struct UpdateEntityAfterFallOnInterface &) const; /** * @vftbl 81 - * @symbol ?updateEntityAfterFallOn\@SlimeBlock\@\@UEBAXAEBVBlockPos\@\@AEAUUpdateEntityAfterFallOnInterface\@\@\@Z + * @symbol __unk_vfn_81 */ - virtual void updateEntityAfterFallOn(class BlockPos const &, struct UpdateEntityAfterFallOnInterface &) const; + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 163 + * @symbol ?onStandOn\@SlimeBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_132(); + virtual void onStandOn(class EntityContext &, class BlockPos const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_164(); /** * @vftbl 165 - * @symbol ?onStandOn\@SlimeBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z + * @symbol __unk_vfn_165 */ - virtual void onStandOn(class EntityContext &, class BlockPos const &) const; + 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 170 * @symbol ?onFallOn\@SlimeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 183 + * @vftbl 181 * @symbol ?getExtraRenderLayers\@SlimeBlock\@\@UEBAHXZ */ virtual int getExtraRenderLayers() const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SLIMEBLOCK /** * @symbol ?isBounceBlock\@SlimeBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/SlotDescriptor.hpp b/LiteLoader/include/llapi/mc/SlotDescriptor.hpp index 2dd215ca51..c235c0f277 100644 --- a/LiteLoader/include/llapi/mc/SlotDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/SlotDescriptor.hpp @@ -22,14 +22,14 @@ struct SlotDescriptor { #undef AFTER_EXTRA public: - /** - * @symbol ??0SlotDescriptor\@\@QEAA\@XZ - */ - MCAPI SlotDescriptor(); /** * @symbol ??0SlotDescriptor\@\@QEAA\@AEBU0\@\@Z */ MCAPI SlotDescriptor(struct SlotDescriptor const &); + /** + * @symbol ??0SlotDescriptor\@\@QEAA\@XZ + */ + MCAPI SlotDescriptor(); /** * @symbol ?addAcceptedItem\@SlotDescriptor\@\@QEAAXAEBVItemDescriptor\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SmallDripleafBlock.hpp b/LiteLoader/include/llapi/mc/SmallDripleafBlock.hpp index e2895009b2..0effed49f2 100644 --- a/LiteLoader/include/llapi/mc/SmallDripleafBlock.hpp +++ b/LiteLoader/include/llapi/mc/SmallDripleafBlock.hpp @@ -5,7 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "BlockLegacy.hpp" +#include "BushBlock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +16,7 @@ * @brief MC class SmallDripleafBlock. * */ -class SmallDripleafBlock : public BlockLegacy { +class SmallDripleafBlock : public BushBlock { #define AFTER_EXTRA // Add Member There @@ -45,16 +45,21 @@ class SmallDripleafBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -67,14 +72,14 @@ class SmallDripleafBlock : public BlockLegacy { virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol __unk_vfn_34 + * @symbol ?isWaterBlocking\@SmallDripleafBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_34(); + virtual bool isWaterBlocking() const; /** * @vftbl 35 - * @symbol ?isWaterBlocking\@SmallDripleafBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_35 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +111,10 @@ class SmallDripleafBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,15 +141,15 @@ class SmallDripleafBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -152,151 +157,146 @@ class SmallDripleafBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@SmallDripleafBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@SmallDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@SmallDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@SmallDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 93 + * @vftbl 92 * @symbol ?mayPlaceOn\@SmallDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@SmallDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 153 + * @vftbl 151 * @symbol ?init\@SmallDripleafBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@SmallDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@SmallDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@SmallDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 + * @vftbl 187 * @symbol ?playerDestroy\@SmallDripleafBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 + * @vftbl 188 * @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 2e786c854a..d6f047370a 100644 --- a/LiteLoader/include/llapi/mc/SmallFireball.hpp +++ b/LiteLoader/include/llapi/mc/SmallFireball.hpp @@ -37,125 +37,120 @@ class SmallFireball : public Fireball { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 - */ - virtual void __unk_vfn_88(); - /** - * @vftbl 95 + * @vftbl 93 * @symbol ?isPickable\@SmallFireball\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 + */ + virtual void __unk_vfn_94(); + /** + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@SmallFireball\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 269 + * @symbol __unk_vfn_269 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_269(); /** * @symbol ??0SmallFireball\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SmithingTableBlock.hpp b/LiteLoader/include/llapi/mc/SmithingTableBlock.hpp index c1df7c3f1f..fb90398af8 100644 --- a/LiteLoader/include/llapi/mc/SmithingTableBlock.hpp +++ b/LiteLoader/include/llapi/mc/SmithingTableBlock.hpp @@ -40,16 +40,21 @@ class SmithingTableBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class SmithingTableBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class SmithingTableBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,110 +131,105 @@ class SmithingTableBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@SmithingTableBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #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 0946ce70ed..8e8752f3dd 100644 --- a/LiteLoader/include/llapi/mc/SmithingTemplateItem.hpp +++ b/LiteLoader/include/llapi/mc/SmithingTemplateItem.hpp @@ -31,11 +31,6 @@ class SmithingTemplateItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -51,6 +46,11 @@ class SmithingTemplateItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -106,6 +106,16 @@ class SmithingTemplateItem : public Item { * @symbol ?buildDescriptionId\@SmithingTemplateItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); /** * @symbol ??0SmithingTemplateItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4UpgradeType\@0\@0\@Z */ diff --git a/LiteLoader/include/llapi/mc/SmithingTransformRecipe.hpp b/LiteLoader/include/llapi/mc/SmithingTransformRecipe.hpp index 5ad8d7e6d1..7aebc3e098 100644 --- a/LiteLoader/include/llapi/mc/SmithingTransformRecipe.hpp +++ b/LiteLoader/include/llapi/mc/SmithingTransformRecipe.hpp @@ -32,9 +32,9 @@ class SmithingTransformRecipe : public ShapelessRecipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@SmithingTransformRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z + * @symbol ?assemble\@SmithingTransformRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEAVCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; + virtual std::vector const & assemble(class CraftingContainer &, class CraftingContext &) const; /** * @vftbl 5 * @symbol __unk_vfn_5 @@ -42,9 +42,9 @@ class SmithingTransformRecipe : public ShapelessRecipe { virtual void __unk_vfn_5(); /** * @vftbl 6 - * @symbol ?matches\@SmithingTransformRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @symbol ?matches\@SmithingTransformRecipe\@\@UEBA_NAEBVCraftingContainer\@\@AEBVCraftingContext\@\@\@Z */ - virtual bool matches(class CraftingContainer &, class Level &) const; + virtual bool matches(class CraftingContainer const &, class CraftingContext const &) const; /** * @symbol ??0SmithingTransformRecipe\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVRecipeIngredient\@\@11AEBVItemInstance\@\@AEBVHashedString\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SmithingTrimRecipe.hpp b/LiteLoader/include/llapi/mc/SmithingTrimRecipe.hpp index d1024b6d67..56325b530f 100644 --- a/LiteLoader/include/llapi/mc/SmithingTrimRecipe.hpp +++ b/LiteLoader/include/llapi/mc/SmithingTrimRecipe.hpp @@ -32,9 +32,9 @@ class SmithingTrimRecipe : public ShapelessRecipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@SmithingTrimRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z + * @symbol ?assemble\@SmithingTrimRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEAVCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; + virtual std::vector const & assemble(class CraftingContainer &, class CraftingContext &) const; /** * @vftbl 5 * @symbol __unk_vfn_5 @@ -42,9 +42,9 @@ class SmithingTrimRecipe : public ShapelessRecipe { virtual void __unk_vfn_5(); /** * @vftbl 6 - * @symbol ?matches\@SmithingTrimRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @symbol ?matches\@SmithingTrimRecipe\@\@UEBA_NAEBVCraftingContainer\@\@AEBVCraftingContext\@\@\@Z */ - virtual bool matches(class CraftingContainer &, class Level &) const; + virtual bool matches(class CraftingContainer const &, class CraftingContext const &) const; /** * @vftbl 10 * @symbol ?hasDataDrivenResult\@SmithingTrimRecipe\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/SmithingTrimRecipeUtils.hpp b/LiteLoader/include/llapi/mc/SmithingTrimRecipeUtils.hpp index 18245211ba..6cc49d4a3d 100644 --- a/LiteLoader/include/llapi/mc/SmithingTrimRecipeUtils.hpp +++ b/LiteLoader/include/llapi/mc/SmithingTrimRecipeUtils.hpp @@ -17,9 +17,9 @@ namespace SmithingTrimRecipeUtils { #undef AFTER_EXTRA /** - * @symbol ?doesItemHaveResultingTrim\@SmithingTrimRecipeUtils\@\@YA_NAEBVLevel\@\@AEBVItemStack\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@2\@Z + * @symbol ?doesItemHaveResultingTrim\@SmithingTrimRecipeUtils\@\@YA_NAEBVCraftingContext\@\@AEBVItemStack\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@2\@Z */ - MCAPI bool doesItemHaveResultingTrim(class Level const &, class ItemStack const &, std::string const &, std::string const &); + MCAPI bool doesItemHaveResultingTrim(class CraftingContext const &, class ItemStack const &, std::string const &, std::string const &); /** * @symbol ?validateAdditionIngredient\@SmithingTrimRecipeUtils\@\@YA_NAEBVLevel\@\@VRecipeIngredient\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SmokerBlock.hpp b/LiteLoader/include/llapi/mc/SmokerBlock.hpp index 994c4a8b95..96f4ef26d1 100644 --- a/LiteLoader/include/llapi/mc/SmokerBlock.hpp +++ b/LiteLoader/include/llapi/mc/SmokerBlock.hpp @@ -40,16 +40,21 @@ class SmokerBlock : public FurnaceBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class SmokerBlock : public FurnaceBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class SmokerBlock : public FurnaceBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,122 +131,117 @@ class SmokerBlock : public FurnaceBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@SmokerBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@SmokerBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@SmokerBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@SmokerBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/SneakMovementSystem.hpp b/LiteLoader/include/llapi/mc/SneakMovementSystem.hpp index e6af5c7cbb..44512be42a 100644 --- a/LiteLoader/include/llapi/mc/SneakMovementSystem.hpp +++ b/LiteLoader/include/llapi/mc/SneakMovementSystem.hpp @@ -46,13 +46,13 @@ 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\@\@UPlayerGameTypeComponent\@\@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\@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\@\@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 */ - 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, 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\@\@UPlayerGameTypeComponent\@\@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\@ULocalConstBlockSourceFactoryComponent\@\@ULocalSpatialEntityFetcherFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @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 */ - 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<>> &); + 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<>> &); /** * @symbol ?create\@SneakMovementSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ @@ -62,8 +62,8 @@ struct SneakMovementSystem { */ MCAPI static struct TickingSystemWithInfo createSideBySide(); /** - * @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\@\@UPlayerGameTypeComponent\@\@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\@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 ?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 */ - 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 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 &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SneakTriggerSystem.hpp b/LiteLoader/include/llapi/mc/SneakTriggerSystem.hpp index 8eb33cbaf1..da38ec5ae4 100644 --- a/LiteLoader/include/llapi/mc/SneakTriggerSystem.hpp +++ b/LiteLoader/include/llapi/mc/SneakTriggerSystem.hpp @@ -29,8 +29,12 @@ class SneakTriggerSystem { */ MCAPI static struct TickingSystemWithInfo createTriggerSystem(bool); /** - * @symbol ?updatePlayerState\@SneakTriggerSystem\@\@SA?AV?$optional\@_N\@std\@\@AEBVGetCollisionShapeInterface\@\@AEBVAABB\@\@AEBVVec2\@\@_N33MPEAUPlayerActionComponent\@\@AEBVLayeredAbilities\@\@AEBVIConstBlockSource\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@3\@\@Z + * @symbol ?determinePose\@SneakTriggerSystem\@\@SA?AUPlayerPoseTransitions\@1\@AEAUDeterminePoseArgs\@1\@\@Z */ - MCAPI static class std::optional updatePlayerState(class GetCollisionShapeInterface const &, class AABB const &, class Vec2 const &, bool, bool, bool, float, struct PlayerActionComponent *, class LayeredAbilities const &, class IConstBlockSource const &, std::vector &); + 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); }; diff --git a/LiteLoader/include/llapi/mc/Sniffer.hpp b/LiteLoader/include/llapi/mc/Sniffer.hpp index b62349420e..2fd0333d91 100644 --- a/LiteLoader/include/llapi/mc/Sniffer.hpp +++ b/LiteLoader/include/llapi/mc/Sniffer.hpp @@ -32,130 +32,125 @@ class Sniffer : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 133 + * @vftbl 131 * @symbol ?getAmbientSound\@Sniffer\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getAmbientSound() const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 + */ + virtual void __unk_vfn_176(); + /** + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); - /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0Sniffer\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SnifferEggBlock.hpp b/LiteLoader/include/llapi/mc/SnifferEggBlock.hpp new file mode 100644 index 0000000000..70578b6320 --- /dev/null +++ b/LiteLoader/include/llapi/mc/SnifferEggBlock.hpp @@ -0,0 +1,289 @@ +/** + * @file SnifferEggBlock.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "BlockLegacy.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class SnifferEggBlock : public BlockLegacy { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SNIFFEREGGBLOCK +public: + class SnifferEggBlock& operator=(class SnifferEggBlock const &) = delete; + SnifferEggBlock(class SnifferEggBlock const &) = delete; + SnifferEggBlock() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + 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(); + /** + * @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 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 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 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @vftbl 59 + * @symbol __unk_vfn_59 + */ + virtual void __unk_vfn_59(); + /** + * @vftbl 60 + * @symbol __unk_vfn_60 + */ + virtual void __unk_vfn_60(); + /** + * @vftbl 68 + * @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 + */ + virtual void __unk_vfn_74(); + /** + * @vftbl 81 + * @symbol __unk_vfn_81 + */ + virtual void __unk_vfn_81(); + /** + * @vftbl 91 + * @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 + */ + virtual void __unk_vfn_122(); + /** + * @vftbl 123 + * @symbol __unk_vfn_123 + */ + virtual void __unk_vfn_123(); + /** + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 + */ + virtual void __unk_vfn_127(); + /** + * @vftbl 130 + * @symbol __unk_vfn_130 + */ + virtual void __unk_vfn_130(); + /** + * @vftbl 132 + * @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 + * @symbol ?getVariant\@SnifferEggBlock\@\@UEBAHAEBVBlock\@\@\@Z + */ + virtual int getVariant(class Block const &) const; + /** + * @vftbl 155 + * @symbol __unk_vfn_155 + */ + virtual void __unk_vfn_155(); + /** + * @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 ?onPlace\@SnifferEggBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + virtual void onPlace(class BlockSource &, class BlockPos const &) const; + /** + * @vftbl 169 + * @symbol __unk_vfn_169 + */ + virtual void __unk_vfn_169(); + /** + * @vftbl 170 + * @symbol ?tick\@SnifferEggBlock\@\@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 188 + * @symbol ?getResourceItem\@SnifferEggBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + */ + virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SNIFFEREGGBLOCK + /** + * @symbol ?canBeSilkTouched\@SnifferEggBlock\@\@UEBA_NXZ + */ + MCVAPI bool canBeSilkTouched() const; + /** + * @symbol ?waterSpreadCausesSpawn\@SnifferEggBlock\@\@UEBA_NXZ + */ + MCVAPI bool waterSpreadCausesSpawn() const; +#endif + /** + * @symbol ??0SnifferEggBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + */ + MCAPI SnifferEggBlock(std::string const &, int); + +//private: + /** + * @symbol ?_addToRandomTickingQueue\@SnifferEggBlock\@\@CAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI static void _addToRandomTickingQueue(class BlockSource &, class BlockPos const &); + /** + * @symbol ?_shouldHatchFaster\@SnifferEggBlock\@\@CA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI static bool _shouldHatchFaster(class BlockSource &, class BlockPos const &); + /** + * @symbol ?_spawnParticles\@SnifferEggBlock\@\@CAXW4LevelEvent\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI static void _spawnParticles(enum class LevelEvent, class BlockSource &, class BlockPos const &); + +private: + +}; diff --git a/LiteLoader/include/llapi/mc/SnowBlock.hpp b/LiteLoader/include/llapi/mc/SnowBlock.hpp index 3283097270..783a655130 100644 --- a/LiteLoader/include/llapi/mc/SnowBlock.hpp +++ b/LiteLoader/include/llapi/mc/SnowBlock.hpp @@ -45,16 +45,21 @@ class SnowBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class SnowBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class SnowBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,40 +136,40 @@ class SnowBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -172,76 +177,66 @@ class SnowBlock : public BlockLegacy { virtual void __unk_vfn_123(); /** * @vftbl 124 - * @symbol ?calcGroundFriction\@SnowBlock\@\@UEBAMAEBUIMobMovementProxy\@\@AEBVBlockPos\@\@\@Z + * @symbol __unk_vfn_124 */ - virtual float calcGroundFriction(struct IMobMovementProxy const &, class BlockPos const &) const; + virtual void __unk_vfn_124(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_169(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_173(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_177(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 - */ - virtual void __unk_vfn_187(); - /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@SnowBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @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 abf8cb3152..105e1f45e8 100644 --- a/LiteLoader/include/llapi/mc/Snowball.hpp +++ b/LiteLoader/include/llapi/mc/Snowball.hpp @@ -42,115 +42,110 @@ class Snowball : public Throwable { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_267(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 269 + * @symbol __unk_vfn_269 */ - virtual void __unk_vfn_275(); - /** - * @vftbl 277 - * @symbol __unk_vfn_277 - */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_269(); /** * @symbol ??0Snowball\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SnowballItem.hpp b/LiteLoader/include/llapi/mc/SnowballItem.hpp index 5cf2ae1924..4be2b6f6ce 100644 --- a/LiteLoader/include/llapi/mc/SnowballItem.hpp +++ b/LiteLoader/include/llapi/mc/SnowballItem.hpp @@ -36,11 +36,6 @@ class SnowballItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class SnowballItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 23 * @symbol ?isThrowable\@SnowballItem\@\@UEBA_NXZ @@ -116,5 +116,15 @@ class SnowballItem : public Item { * @symbol ?dispense\@SnowballItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); }; diff --git a/LiteLoader/include/llapi/mc/Social.hpp b/LiteLoader/include/llapi/mc/Social.hpp index a769f1bc25..238c591806 100644 --- a/LiteLoader/include/llapi/mc/Social.hpp +++ b/LiteLoader/include/llapi/mc/Social.hpp @@ -22,6 +22,11 @@ namespace Social { class MultiplayerServiceManager; namespace Events { +class PlayerTelemetry { + PlayerTelemetry() = delete; + PlayerTelemetry(PlayerTelemetry const&) = delete; + PlayerTelemetry(PlayerTelemetry const&&) = delete; +}; class AchievementEventing { public: AchievementEventing() = delete; diff --git a/LiteLoader/include/llapi/mc/BlueFireBlock.hpp b/LiteLoader/include/llapi/mc/SoulFireBlock.hpp similarity index 55% rename from LiteLoader/include/llapi/mc/BlueFireBlock.hpp rename to LiteLoader/include/llapi/mc/SoulFireBlock.hpp index 1aa4aa0075..27904ea4e6 100644 --- a/LiteLoader/include/llapi/mc/BlueFireBlock.hpp +++ b/LiteLoader/include/llapi/mc/SoulFireBlock.hpp @@ -1,5 +1,5 @@ /** - * @file BlueFireBlock.hpp + * @file SoulFireBlock.hpp * */ #pragma once @@ -8,25 +8,20 @@ #include "BlockLegacy.hpp" #define BEFORE_EXTRA -// Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC class BlueFireBlock. - * - */ -class BlueFireBlock : public BlockLegacy { + +class SoulFireBlock : public BlockLegacy { #define AFTER_EXTRA -// Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLUEFIREBLOCK +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SOULFIREBLOCK public: - class BlueFireBlock& operator=(class BlueFireBlock const &) = delete; - BlueFireBlock(class BlueFireBlock const &) = delete; - BlueFireBlock() = delete; + class SoulFireBlock& operator=(class SoulFireBlock const &) = delete; + SoulFireBlock(class SoulFireBlock const &) = delete; + SoulFireBlock() = delete; #endif public: @@ -37,7 +32,7 @@ class BlueFireBlock : public BlockLegacy { virtual void __unk_vfn_0(); /** * @vftbl 10 - * @symbol ?getAABB\@BlueFireBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @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; /** @@ -45,16 +40,21 @@ class BlueFireBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +66,10 @@ class BlueFireBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +101,10 @@ class BlueFireBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,15 +131,15 @@ class BlueFireBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -147,84 +147,89 @@ class BlueFireBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 - * @symbol ?canContainLiquid\@BlueFireBlock\@\@UEBA_NXZ + * @symbol ?canContainLiquid\@SoulFireBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 89 - * @symbol ?mayPick\@BlueFireBlock\@\@UEBA_NXZ + * @vftbl 88 + * @symbol ?mayPick\@SoulFireBlock\@\@UEBA_NXZ */ virtual bool mayPick() const; /** - * @vftbl 92 - * @symbol ?mayPlace\@BlueFireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 91 + * @symbol ?mayPlace\@SoulFireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@BlueFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 98 + * @symbol ?neighborChanged\@SoulFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 113 - * @symbol ?entityInside\@BlueFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 112 + * @symbol ?entityInside\@SoulFireBlock\@\@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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 150 + * @symbol ?animateTick\@SoulFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ - virtual void __unk_vfn_132(); + virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 152 - * @symbol ?animateTick\@BlueFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; + virtual void __unk_vfn_155(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_164(); + /** + * @vftbl 165 + * @symbol __unk_vfn_165 + */ + virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -232,66 +237,56 @@ class BlueFireBlock : public BlockLegacy { 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 ?onPlace\@BlueFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?onPlace\@SoulFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 - * @symbol ?tick\@BlueFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 170 + * @symbol ?tick\@SoulFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 - * @symbol ?canSurvive\@BlueFireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol ?canSurvive\@SoulFireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLUEFIREBLOCK + virtual void __unk_vfn_186(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SOULFIREBLOCK /** - * @symbol ?canBeSilkTouched\@BlueFireBlock\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@SoulFireBlock\@\@UEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?waterSpreadCausesSpawn\@BlueFireBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@SoulFireBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0BlueFireBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0SoulFireBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ - MCAPI BlueFireBlock(std::string const &, int); + MCAPI SoulFireBlock(std::string const &, int); /** - * @symbol ?isValidBlueFireFuel\@BlueFireBlock\@\@SA_NAEBVBlockLegacy\@\@\@Z + * @symbol ?isValidSoulFireFuel\@SoulFireBlock\@\@SA_NAEBVBlockLegacy\@\@\@Z */ - MCAPI static bool isValidBlueFireFuel(class BlockLegacy const &); + MCAPI static bool isValidSoulFireFuel(class BlockLegacy const &); }; diff --git a/LiteLoader/include/llapi/mc/SoulSandBlock.hpp b/LiteLoader/include/llapi/mc/SoulSandBlock.hpp index 5fd0720250..70e7f262a5 100644 --- a/LiteLoader/include/llapi/mc/SoulSandBlock.hpp +++ b/LiteLoader/include/llapi/mc/SoulSandBlock.hpp @@ -50,16 +50,21 @@ class SoulSandBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -71,10 +76,10 @@ class SoulSandBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +111,10 @@ class SoulSandBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,50 +141,50 @@ class SoulSandBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 96 + * @vftbl 95 * @symbol ?breaksFallingBlocks\@SoulSandBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@SoulSandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -187,34 +192,34 @@ class SoulSandBlock : public BlockLegacy { virtual void __unk_vfn_123(); /** * @vftbl 124 - * @symbol ?calcGroundFriction\@SoulSandBlock\@\@UEBAMAEBUIMobMovementProxy\@\@AEBVBlockPos\@\@\@Z + * @symbol __unk_vfn_124 */ - virtual float calcGroundFriction(struct IMobMovementProxy const &, class BlockPos const &) const; + virtual void __unk_vfn_124(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -222,49 +227,39 @@ class SoulSandBlock : public BlockLegacy { 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 ?onPlace\@SoulSandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@SoulSandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 + * @vftbl 171 * @symbol ?randomTick\@SoulSandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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/SoulSpeedEnchant.hpp b/LiteLoader/include/llapi/mc/SoulSpeedEnchant.hpp index d5ce678844..5781be9436 100644 --- a/LiteLoader/include/llapi/mc/SoulSpeedEnchant.hpp +++ b/LiteLoader/include/llapi/mc/SoulSpeedEnchant.hpp @@ -96,10 +96,6 @@ class SoulSpeedEnchant : public Enchant { * @symbol ?getSpeedBoost\@SoulSpeedEnchant\@\@SAMH\@Z */ MCAPI static float getSpeedBoost(int); - /** - * @symbol ?isActive\@SoulSpeedEnchant\@\@SA_NAEBVActor\@\@\@Z - */ - MCAPI static bool isActive(class Actor const &); /** * @symbol ?shouldSpawnParticles\@SoulSpeedEnchant\@\@SA_NAEBVActor\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SoulTorchBlock.hpp b/LiteLoader/include/llapi/mc/SoulTorchBlock.hpp index e727c7d3f8..a4e776a732 100644 --- a/LiteLoader/include/llapi/mc/SoulTorchBlock.hpp +++ b/LiteLoader/include/llapi/mc/SoulTorchBlock.hpp @@ -40,16 +40,21 @@ class SoulTorchBlock : public TorchBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class SoulTorchBlock : public TorchBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class SoulTorchBlock : public TorchBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,115 +131,110 @@ class SoulTorchBlock : public TorchBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@SoulTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 162 + * @vftbl 160 * @symbol ?_addHardCodedBlockComponents\@SoulTorchBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 4ae6712783..e70b62cd38 100644 --- a/LiteLoader/include/llapi/mc/SparklerItem.hpp +++ b/LiteLoader/include/llapi/mc/SparklerItem.hpp @@ -42,11 +42,6 @@ struct ColorInfo { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -62,6 +57,11 @@ struct ColorInfo { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 49 * @symbol ?isHandEquipped\@SparklerItem\@\@UEBA_NXZ @@ -123,17 +123,27 @@ struct ColorInfo { */ virtual bool inventoryTick(class ItemStack &, class Level &, class Actor &, int, bool) const; /** - * @vftbl 117 + * @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\@SparklerItem\@\@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 118 + * @vftbl 120 * @symbol ?getIconInfo\@SparklerItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 122 + * @vftbl 124 * @symbol ?getLightEmission\@SparklerItem\@\@UEBA?AUBrightness\@\@H\@Z */ virtual struct Brightness getLightEmission(int) const; diff --git a/LiteLoader/include/llapi/mc/SpawnChecks.hpp b/LiteLoader/include/llapi/mc/SpawnChecks.hpp index da3b12958d..c14a9af5e9 100644 --- a/LiteLoader/include/llapi/mc/SpawnChecks.hpp +++ b/LiteLoader/include/llapi/mc/SpawnChecks.hpp @@ -28,9 +28,9 @@ class SpawnChecks { public: /** - * @symbol ?canHatchTurtle\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z + * @symbol ?canHatchEgg\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z */ - MCAPI static bool canHatchTurtle(class ILevel const &); + MCAPI static bool canHatchEgg(class ILevel const &); /** * @symbol ?canRespawnEnderDragon\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SpawnClimateFinder.hpp b/LiteLoader/include/llapi/mc/SpawnClimateFinder.hpp index ef7c980002..36df16f2b7 100644 --- a/LiteLoader/include/llapi/mc/SpawnClimateFinder.hpp +++ b/LiteLoader/include/llapi/mc/SpawnClimateFinder.hpp @@ -50,9 +50,9 @@ struct ResultDetails { //private: /** - * @symbol ?_getSpawnPositionAndFitness\@SpawnClimateFinder\@\@AEBA?AU?$pair\@VBlockPos\@\@_J\@std\@\@VBlockPos\@\@\@Z + * @symbol ?_calculateClimateFitness\@SpawnClimateFinder\@\@AEBA_JVBlockPos\@\@\@Z */ - MCAPI struct std::pair _getSpawnPositionAndFitness(class BlockPos) const; + MCAPI __int64 _calculateClimateFitness(class BlockPos) const; /** * @symbol ?_radialSearch\@SpawnClimateFinder\@\@AEBA?AUResultDetails\@1\@U21\@HH\@Z */ diff --git a/LiteLoader/include/llapi/mc/SpawnData.hpp b/LiteLoader/include/llapi/mc/SpawnData.hpp index 68af9b31d8..452d919dbe 100644 --- a/LiteLoader/include/llapi/mc/SpawnData.hpp +++ b/LiteLoader/include/llapi/mc/SpawnData.hpp @@ -28,14 +28,14 @@ class SpawnData { #endif public: - /** - * @symbol ??0SpawnData\@\@QEAA\@AEBVCompoundTag\@\@\@Z - */ - MCAPI SpawnData(class CompoundTag const &); /** * @symbol ??0SpawnData\@\@QEAA\@AEBV0\@\@Z */ MCAPI SpawnData(class SpawnData const &); + /** + * @symbol ??0SpawnData\@\@QEAA\@AEBVCompoundTag\@\@\@Z + */ + MCAPI SpawnData(class CompoundTag const &); /** * @symbol ?save\@SpawnData\@\@QEAA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/SpawnExperienceOrbPacket.hpp b/LiteLoader/include/llapi/mc/SpawnExperienceOrbPacket.hpp index 3b04fca433..f94e81b155 100644 --- a/LiteLoader/include/llapi/mc/SpawnExperienceOrbPacket.hpp +++ b/LiteLoader/include/llapi/mc/SpawnExperienceOrbPacket.hpp @@ -51,9 +51,9 @@ class SpawnExperienceOrbPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SpawnExperienceOrbPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SpawnExperienceOrbPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 a58c89b8ed..a2e9ea6851 100644 --- a/LiteLoader/include/llapi/mc/SpawnParticleEffectPacket.hpp +++ b/LiteLoader/include/llapi/mc/SpawnParticleEffectPacket.hpp @@ -51,9 +51,9 @@ class SpawnParticleEffectPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SpawnParticleEffectPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SpawnParticleEffectPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SPAWNPARTICLEEFFECTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/SpectatorFilterSystemImpl.hpp b/LiteLoader/include/llapi/mc/SpectatorFilterSystemImpl.hpp new file mode 100644 index 0000000000..c6b8533325 --- /dev/null +++ b/LiteLoader/include/llapi/mc/SpectatorFilterSystemImpl.hpp @@ -0,0 +1,24 @@ +/** + * @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 6e0475817a..7e86f145ea 100644 --- a/LiteLoader/include/llapi/mc/Spider.hpp +++ b/LiteLoader/include/llapi/mc/Spider.hpp @@ -39,157 +39,152 @@ enum class Type; */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 76 + * @vftbl 74 * @symbol ?setBlockMovementSlowdownMultiplier\@Spider\@\@UEAAXAEBVBlockLegacy\@\@AEBVVec3\@\@\@Z */ virtual void setBlockMovementSlowdownMultiplier(class BlockLegacy const &, class Vec3 const &); /** - * @vftbl 80 + * @vftbl 78 * @symbol ?getShadowRadius\@Spider\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 131 + * @vftbl 129 * @symbol ?shouldRender\@Spider\@\@UEBA_NXZ */ virtual bool shouldRender() const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 207 + * @vftbl 205 * @symbol ?canBeAffected\@Spider\@\@UEBA_NI\@Z */ virtual bool canBeAffected(unsigned int) const; /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 266 + * @vftbl 258 * @symbol ?_playStepSound\@Spider\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** - * @vftbl 354 + * @vftbl 346 * @symbol ?getModelScale\@Spider\@\@UEBAMXZ */ virtual float getModelScale() const; /** - * @vftbl 355 + * @vftbl 347 * @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 e9b4f542d3..b619383d9e 100644 --- a/LiteLoader/include/llapi/mc/SplashPotionItem.hpp +++ b/LiteLoader/include/llapi/mc/SplashPotionItem.hpp @@ -37,11 +37,6 @@ class SplashPotionItem : public PotionItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -57,6 +52,11 @@ class SplashPotionItem : public PotionItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 23 * @symbol ?isThrowable\@SplashPotionItem\@\@UEBA_NXZ @@ -128,17 +128,27 @@ class SplashPotionItem : public PotionItem { */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 117 + * @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\@SplashPotionItem\@\@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 118 + * @vftbl 120 * @symbol ?getIconInfo\@SplashPotionItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 133 + * @vftbl 135 * @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 639f1dce9f..8d7f9e6a42 100644 --- a/LiteLoader/include/llapi/mc/SplitBlockUtils.hpp +++ b/LiteLoader/include/llapi/mc/SplitBlockUtils.hpp @@ -20,10 +20,22 @@ namespace SplitBlockUtils { * @symbol ?LegacyBlockInfos\@SplitBlockUtils\@\@3V?$vector\@V?$reference_wrapper\@$$CBULegacyBlockInfo\@SplitBlockUtils\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@$$CBULegacyBlockInfo\@SplitBlockUtils\@\@\@std\@\@\@2\@\@std\@\@B */ MCAPI extern std::vector> const LegacyBlockInfos; + /** + * @symbol ?LegacyCarpetInfo\@SplitBlockUtils\@\@3ULegacyBlockInfo\@1\@B + */ + MCAPI extern struct SplitBlockUtils::LegacyBlockInfo const LegacyCarpetInfo; + /** + * @symbol ?LegacyCoralInfo\@SplitBlockUtils\@\@3ULegacyBlockInfo\@1\@B + */ + MCAPI extern struct SplitBlockUtils::LegacyBlockInfo const LegacyCoralInfo; /** * @symbol ?LegacyFenceInfo\@SplitBlockUtils\@\@3ULegacyBlockInfo\@1\@B */ MCAPI extern struct SplitBlockUtils::LegacyBlockInfo const LegacyFenceInfo; + /** + * @symbol ?LegacyLavaCauldronInfo\@SplitBlockUtils\@\@3ULegacyBlockInfo\@1\@B + */ + MCAPI extern struct SplitBlockUtils::LegacyBlockInfo const LegacyLavaCauldronInfo; /** * @symbol ?LegacyLog2Info\@SplitBlockUtils\@\@3ULegacyBlockInfo\@1\@B */ diff --git a/LiteLoader/include/llapi/mc/SpongeBlock.hpp b/LiteLoader/include/llapi/mc/SpongeBlock.hpp index d85f52f212..5b0c2ec1a4 100644 --- a/LiteLoader/include/llapi/mc/SpongeBlock.hpp +++ b/LiteLoader/include/llapi/mc/SpongeBlock.hpp @@ -40,16 +40,21 @@ class SpongeBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class SpongeBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class SpongeBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,152 +131,147 @@ class SpongeBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** * @vftbl 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 55 * @symbol ?isValidAuxValue\@SpongeBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; + /** + * @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 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@SpongeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@SpongeBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@SpongeBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@SpongeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@SpongeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@SpongeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@SpongeBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@SpongeBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/SporeBlossom.hpp b/LiteLoader/include/llapi/mc/SporeBlossomBlock.hpp similarity index 51% rename from LiteLoader/include/llapi/mc/SporeBlossom.hpp rename to LiteLoader/include/llapi/mc/SporeBlossomBlock.hpp index 01c201157c..db4f28f258 100644 --- a/LiteLoader/include/llapi/mc/SporeBlossom.hpp +++ b/LiteLoader/include/llapi/mc/SporeBlossomBlock.hpp @@ -1,5 +1,5 @@ /** - * @file SporeBlossom.hpp + * @file SporeBlossomBlock.hpp * */ #pragma once @@ -8,25 +8,20 @@ #include "BlockLegacy.hpp" #define BEFORE_EXTRA -// Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC class SporeBlossom. - * - */ -class SporeBlossom : public BlockLegacy { + +class SporeBlossomBlock : public BlockLegacy { #define AFTER_EXTRA -// Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SPOREBLOSSOM +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SPOREBLOSSOMBLOCK public: - class SporeBlossom& operator=(class SporeBlossom const &) = delete; - SporeBlossom(class SporeBlossom const &) = delete; - SporeBlossom() = delete; + class SporeBlossomBlock& operator=(class SporeBlossomBlock const &) = delete; + SporeBlossomBlock(class SporeBlossomBlock const &) = delete; + SporeBlossomBlock() = delete; #endif public: @@ -37,7 +32,7 @@ class SporeBlossom : public BlockLegacy { virtual void __unk_vfn_0(); /** * @vftbl 10 - * @symbol ?getAABB\@SporeBlossom\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @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; /** @@ -45,16 +40,21 @@ class SporeBlossom : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +66,10 @@ class SporeBlossom : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +101,10 @@ class SporeBlossom : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,15 +131,15 @@ class SporeBlossom : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -147,128 +147,123 @@ class SporeBlossom : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 - * @symbol ?canContainLiquid\@SporeBlossom\@\@UEBA_NXZ + * @symbol ?canContainLiquid\@SporeBlossomBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 92 - * @symbol ?mayPlace\@SporeBlossom\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 91 + * @symbol ?mayPlace\@SporeBlossomBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@SporeBlossom\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 98 + * @symbol ?neighborChanged\@SporeBlossomBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 152 - * @symbol ?animateTick\@SporeBlossom\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 150 + * @symbol ?animateTick\@SporeBlossomBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 - * @symbol ?tick\@SporeBlossom\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 170 + * @symbol ?tick\@SporeBlossomBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 - * @symbol ?canSurvive\@SporeBlossom\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol ?canSurvive\@SporeBlossomBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SPOREBLOSSOM + virtual void __unk_vfn_186(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SPOREBLOSSOMBLOCK /** - * @symbol ?canBeSilkTouched\@SporeBlossom\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@SporeBlossomBlock\@\@UEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; #endif /** - * @symbol ??0SporeBlossom\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0SporeBlossomBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ - MCAPI SporeBlossom(std::string const &, int); + MCAPI SporeBlossomBlock(std::string const &, int); }; diff --git a/LiteLoader/include/llapi/mc/SporeBlossomBlockActor.hpp b/LiteLoader/include/llapi/mc/SporeBlossomBlockActor.hpp index 6aa0ecbae2..d58e9ca0b6 100644 --- a/LiteLoader/include/llapi/mc/SporeBlossomBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/SporeBlossomBlockActor.hpp @@ -76,10 +76,10 @@ class SporeBlossomBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); /** * @symbol ??0SporeBlossomBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SpyglassItem.hpp b/LiteLoader/include/llapi/mc/SpyglassItem.hpp index efc50b7f79..be49b0c7f7 100644 --- a/LiteLoader/include/llapi/mc/SpyglassItem.hpp +++ b/LiteLoader/include/llapi/mc/SpyglassItem.hpp @@ -36,11 +36,6 @@ class SpyglassItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class SpyglassItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -121,5 +121,15 @@ class SpyglassItem : public Item { * @symbol ?releaseUsing\@SpyglassItem\@\@UEBAXAEAVItemStack\@\@PEAVPlayer\@\@H\@Z */ virtual void releaseUsing(class ItemStack &, class Player *, int) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); }; diff --git a/LiteLoader/include/llapi/mc/Squid.hpp b/LiteLoader/include/llapi/mc/Squid.hpp index a5b5d8bcf3..2e6f652af5 100644 --- a/LiteLoader/include/llapi/mc/Squid.hpp +++ b/LiteLoader/include/llapi/mc/Squid.hpp @@ -42,157 +42,152 @@ class Squid : public Mob { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 141 + * @vftbl 139 * @symbol ?handleEntityEvent\@Squid\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 258 + * @vftbl 250 * @symbol ?updateEntitySpecificMolangVariables\@Squid\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@Squid\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 288 + * @vftbl 280 * @symbol ?aiStep\@Squid\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 293 + * @vftbl 285 * @symbol ?checkSpawnRules\@Squid\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 294 + * @vftbl 286 * @symbol ?checkSpawnObstruction\@Squid\@\@UEBA_NXZ */ virtual bool checkSpawnObstruction() const; /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** - * @vftbl 353 + * @vftbl 345 * @symbol ?_getInkSquirtSoundEvent\@Squid\@\@MEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent _getInkSquirtSoundEvent() const; diff --git a/LiteLoader/include/llapi/mc/StackResultStorageEntity.hpp b/LiteLoader/include/llapi/mc/StackResultStorageEntity.hpp index 4e5ebb7858..7c06afdee2 100644 --- a/LiteLoader/include/llapi/mc/StackResultStorageEntity.hpp +++ b/LiteLoader/include/llapi/mc/StackResultStorageEntity.hpp @@ -41,10 +41,6 @@ class StackResultStorageEntity { public: //protected: - /** - * @symbol ??0StackResultStorageEntity\@\@IEAA\@$$QEAV0\@\@Z - */ - MCAPI StackResultStorageEntity(class StackResultStorageEntity &&); /** * @symbol ??0StackResultStorageEntity\@\@IEAA\@AEBVWeakStorageEntity\@\@\@Z */ @@ -53,6 +49,10 @@ 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/StainedGlassBlock.hpp b/LiteLoader/include/llapi/mc/StainedGlassBlock.hpp index 87b799f55a..6dedab5ee7 100644 --- a/LiteLoader/include/llapi/mc/StainedGlassBlock.hpp +++ b/LiteLoader/include/llapi/mc/StainedGlassBlock.hpp @@ -45,16 +45,21 @@ class StainedGlassBlock : public BlockLegacy { * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class StainedGlassBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class StainedGlassBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,142 +136,137 @@ class StainedGlassBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 66 + * @vftbl 65 * @symbol ?canBeUsedInCommands\@StainedGlassBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 96 + * @vftbl 95 * @symbol ?breaksFallingBlocks\@StainedGlassBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@StainedGlassBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@StainedGlassBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 186 + * @vftbl 185 * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@StainedGlassBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @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 8a6c94f2ac..985c2dfbdf 100644 --- a/LiteLoader/include/llapi/mc/StainedGlassPaneBlock.hpp +++ b/LiteLoader/include/llapi/mc/StainedGlassPaneBlock.hpp @@ -40,16 +40,21 @@ class StainedGlassPaneBlock : public ThinFenceBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class StainedGlassPaneBlock : public ThinFenceBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class StainedGlassPaneBlock : public ThinFenceBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,122 +131,117 @@ class StainedGlassPaneBlock : public ThinFenceBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@StainedGlassPaneBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@StainedGlassPaneBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 191 + * @vftbl 190 * @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 654a00c382..08152252fe 100644 --- a/LiteLoader/include/llapi/mc/StairBlock.hpp +++ b/LiteLoader/include/llapi/mc/StairBlock.hpp @@ -75,16 +75,21 @@ class StairBlock : public BlockLegacy { * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -96,10 +101,10 @@ class StairBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -131,10 +136,10 @@ class StairBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -161,195 +166,190 @@ class StairBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 - */ - virtual void __unk_vfn_75(); - /** - * @vftbl 80 + * @vftbl 79 * @symbol ?getRedstoneProperty\@StairBlock\@\@UEBA?AW4BlockProperty\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockProperty getRedstoneProperty(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 89 + * @vftbl 88 * @symbol ?mayPick\@StairBlock\@\@UEBA_NXZ */ virtual bool mayPick() const; /** - * @vftbl 90 + * @vftbl 89 * @symbol ?mayPick\@StairBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z */ virtual bool mayPick(class BlockSource const &, class Block const &, bool) const; /** - * @vftbl 91 + * @vftbl 90 * @symbol ?mayPlace\@StairBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 96 + * @vftbl 95 * @symbol ?breaksFallingBlocks\@StairBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 97 + * @vftbl 96 * @symbol ?destroy\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@PEAVActor\@\@\@Z */ virtual void destroy(class BlockSource &, class BlockPos const &, class Block const &, class Actor *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 109 + * @vftbl 108 * @symbol ?attack\@StairBlock\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ virtual bool attack(class Player *, class BlockPos const &) const; /** - * @vftbl 110 + * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@StairBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 + * @vftbl 162 * @symbol ?onExploded\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ virtual void onExploded(class BlockSource &, class BlockPos const &, class Actor *) const; /** - * @vftbl 165 + * @vftbl 163 * @symbol ?onStandOn\@StairBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ virtual void onStandOn(class EntityContext &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 176 + * @vftbl 174 * @symbol ?clip\@StairBlock\@\@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 178 + * @vftbl 176 * @symbol ?use\@StairBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_STAIRBLOCK /** * @symbol ?canBeSilkTouched\@StairBlock\@\@MEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/StartGamePacket.hpp b/LiteLoader/include/llapi/mc/StartGamePacket.hpp index 24de339611..a4ea9e8958 100644 --- a/LiteLoader/include/llapi/mc/StartGamePacket.hpp +++ b/LiteLoader/include/llapi/mc/StartGamePacket.hpp @@ -51,9 +51,9 @@ class StartGamePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@StartGamePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@StartGamePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_STARTGAMEPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/StaticVanillaBlocks.hpp b/LiteLoader/include/llapi/mc/StaticVanillaBlocks.hpp index d680387390..28a109deb9 100644 --- a/LiteLoader/include/llapi/mc/StaticVanillaBlocks.hpp +++ b/LiteLoader/include/llapi/mc/StaticVanillaBlocks.hpp @@ -74,6 +74,7 @@ LIAPI extern class Block const* mBirchTrapdoor; 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* mBlackGlazedTerracotta; LIAPI extern class Block const* mBlackWool; LIAPI extern class Block const* mBlackstone; @@ -84,22 +85,26 @@ LIAPI extern class Block const* mBlackstoneWall; 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* mBlueGlazedTerracotta; LIAPI extern class Block const* mBlueIce; LIAPI extern class Block const* mBlueWool; LIAPI extern class Block const* mBoneBlock; LIAPI extern class Block const* mBookshelf; LIAPI extern class Block const* mBorderBlock; +LIAPI extern class Block const* mBrainCoral; LIAPI extern class Block const* mBrewingStand; LIAPI extern class Block const* mBrickBlock; 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* mBrownGlazedTerracotta; LIAPI extern class Block const* mBrownMushroom; LIAPI extern class Block const* mBrownMushroomBlock; LIAPI extern class Block const* mBrownWool; LIAPI extern class Block const* mBubbleColumn; +LIAPI extern class Block const* mBubbleCoral; LIAPI extern class Block const* mBuddingAmethyst; LIAPI extern class Block const* mCactus; LIAPI extern class Block const* mCake; @@ -109,7 +114,6 @@ LIAPI extern class Block const* mCamera; LIAPI extern class Block const* mCampFire; LIAPI extern class Block const* mCandle; LIAPI extern class Block const* mCandleCake; -LIAPI extern class Block const* mCarpet; LIAPI extern class Block const* mCarrots; LIAPI extern class Block const* mCartographyTable; LIAPI extern class Block const* mCarvedPumpkin; @@ -167,7 +171,6 @@ LIAPI extern class Block const* mConcretePowder; LIAPI extern class Block const* mConduit; LIAPI extern class Block const* mCopperBlock; LIAPI extern class Block const* mCopperOre; -LIAPI extern class Block const* mCoral; LIAPI extern class Block const* mCoralBlock; LIAPI extern class Block const* mCoralFan; LIAPI extern class Block const* mCoralFanDead; @@ -203,6 +206,7 @@ LIAPI extern class Block const* mCutCopperSlab; 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* mCyanGlazedTerracotta; LIAPI extern class Block const* mCyanWool; LIAPI extern class Block const* mDarkOakButton; @@ -219,6 +223,11 @@ LIAPI extern class Block const* mDarkoakStandingSign; LIAPI extern class Block const* mDarkoakWallSign; LIAPI extern class Block const* mDaylightDetector; LIAPI extern class Block const* mDaylightDetectorInverted; +LIAPI extern class Block const* mDeadBrainCoral; +LIAPI extern class Block const* mDeadBubbleCoral; +LIAPI extern class Block const* mDeadFireCoral; +LIAPI extern class Block const* mDeadHornCoral; +LIAPI extern class Block const* mDeadTubeCoral; LIAPI extern class Block const* mDeadbush; LIAPI extern class Block const* mDecoratedPot; LIAPI extern class Block const* mDeepslate; @@ -278,6 +287,7 @@ LIAPI extern class Block const* mExposedDoubleCutCopperSlab; LIAPI extern class Block const* mFarmlandBlock; LIAPI extern class Block const* mFenceGate; LIAPI extern class Block const* mFire; +LIAPI extern class Block const* mFireCoral; LIAPI extern class Block const* mFletchingTable; LIAPI extern class Block const* mFlowerPot; LIAPI extern class Block const* mFloweringAzalea; @@ -302,10 +312,12 @@ LIAPI extern class Block const* mGrassPath; 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* mGrayGlazedTerracotta; 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* mGreenGlazedTerracotta; LIAPI extern class Block const* mGreenWool; LIAPI extern class Block const* mGrindstone; @@ -320,6 +332,7 @@ LIAPI extern class Block const* mHeavyWeightedPressurePlate; LIAPI extern class Block const* mHoneyBlock; LIAPI extern class Block const* mHoneycombBlock; LIAPI extern class Block const* mHopper; +LIAPI extern class Block const* mHornCoral; LIAPI extern class Block const* mIce; LIAPI extern class Block const* mInfestedDeepslate; LIAPI extern class Block const* mInfoUpdate; @@ -351,7 +364,6 @@ LIAPI extern class Block const* mLapisBlock; LIAPI extern class Block const* mLapisOre; LIAPI extern class Block const* mLargeAmethystBud; LIAPI extern class Block const* mLava; -LIAPI extern class Block const* mLavaCauldron; LIAPI extern class Block const* mLeaves; LIAPI extern class Block const* mLeaves2; LIAPI extern class Block const* mLectern; @@ -359,15 +371,18 @@ LIAPI extern class Block const* mLever; 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* mLightBlueGlazedTerracotta; 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* 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* mLimeGlazedTerracotta; LIAPI extern class Block const* mLimeWool; LIAPI extern class Block const* mLitBlastFurnace; @@ -381,6 +396,7 @@ LIAPI extern class Block const* mLodestone; 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* mMagentaGlazedTerracotta; LIAPI extern class Block const* mMagentaWool; LIAPI extern class Block const* mMagma; @@ -444,6 +460,7 @@ LIAPI extern class Block const* mObsidian; 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* mOrangeGlazedTerracotta; LIAPI extern class Block const* mOrangeWool; LIAPI extern class Block const* mOxidizedCopper; @@ -456,11 +473,14 @@ LIAPI extern class Block const* mPackedMud; 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* mPinkGlazedTerracotta; LIAPI extern class Block const* mPinkPetals; LIAPI extern class Block const* mPinkWool; LIAPI extern class Block const* mPiston; LIAPI extern class Block const* mPistonArmCollision; +LIAPI extern class Block const* mPitcherCrop; +LIAPI extern class Block const* mPitcherPlant; LIAPI extern class Block const* mPlanks; LIAPI extern class Block const* mPodzol; LIAPI extern class Block const* mPointedDripstone; @@ -497,6 +517,7 @@ LIAPI extern class Block const* mPumpkin; 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* mPurpleGlazedTerracotta; LIAPI extern class Block const* mPurpleWool; LIAPI extern class Block const* mPurpurBlock; @@ -511,6 +532,7 @@ LIAPI extern class Block const* mRawGoldBlock; 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* mRedFlower; LIAPI extern class Block const* mRedGlazedTerracotta; LIAPI extern class Block const* mRedMushroom; @@ -557,6 +579,7 @@ LIAPI extern class Block const* mSmoothQuartzStairs; LIAPI extern class Block const* mSmoothRedSandstoneStairs; LIAPI extern class Block const* mSmoothSandstoneStairs; LIAPI extern class Block const* mSmoothStone; +LIAPI extern class Block const* mSnifferEgg; LIAPI extern class Block const* mSnow; LIAPI extern class Block const* mSnowLayer; LIAPI extern class Block const* mSoulCampfire; @@ -628,6 +651,7 @@ LIAPI extern class Block const* mTrapdoor; LIAPI extern class Block const* mTrappedChest; LIAPI extern class Block const* mTripWire; LIAPI extern class Block const* mTripWireHook; +LIAPI extern class Block const* mTubeCoral; LIAPI extern class Block const* mTuff; LIAPI extern class Block const* mTurtleEgg; LIAPI extern class Block const* mTwistingVines; @@ -691,6 +715,7 @@ LIAPI extern class Block const* mWeepingVines; 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* mWhiteGlazedTerracotta; LIAPI extern class Block const* mWhiteWool; LIAPI extern class Block const* mWitherRose; @@ -701,6 +726,7 @@ LIAPI extern class Block const* mWoodenPressurePlate; 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* mYellowFlower; LIAPI extern class Block const* mYellowGlazedTerracotta; LIAPI extern class Block const* mYellowWool; diff --git a/LiteLoader/include/llapi/mc/StemBlock.hpp b/LiteLoader/include/llapi/mc/StemBlock.hpp index 6ab07f77c7..1c75cb80ac 100644 --- a/LiteLoader/include/llapi/mc/StemBlock.hpp +++ b/LiteLoader/include/llapi/mc/StemBlock.hpp @@ -5,7 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "BlockLegacy.hpp" +#include "BushBlock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +16,7 @@ * @brief MC class StemBlock. * */ -class StemBlock : public BlockLegacy { +class StemBlock : public BushBlock { #define AFTER_EXTRA // Add Member There @@ -40,16 +40,21 @@ class StemBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class StemBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class StemBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,15 +131,15 @@ class StemBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -142,151 +147,146 @@ class StemBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@StemBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@StemBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@StemBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 93 + * @vftbl 92 * @symbol ?mayPlaceOn\@StemBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@StemBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@StemBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 136 + * @vftbl 134 * @symbol ?getColor\@StemBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 137 + * @vftbl 135 * @symbol ?getColor\@StemBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 138 + * @vftbl 136 * @symbol ?getColorAtPos\@StemBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getColorAtPos(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@StemBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 173 + * @vftbl 171 * @symbol ?randomTick\@StemBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@StemBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @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 0496902ac5..8ee8aa8847 100644 --- a/LiteLoader/include/llapi/mc/StoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/StoneBlock.hpp @@ -40,16 +40,21 @@ class StoneBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class StoneBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class StoneBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,142 +131,137 @@ class StoneBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 52 + * @vftbl 51 * @symbol ?canBeOriginalSurface\@StoneBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@StoneBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@StoneBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 160 + * @vftbl 158 * @symbol ?tryGetInfested\@StoneBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetInfested(class Block const &) const; /** - * @vftbl 162 + * @vftbl 160 * @symbol ?_addHardCodedBlockComponents\@StoneBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 186 + * @vftbl 185 * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @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/StoneBrickBlock.hpp b/LiteLoader/include/llapi/mc/StoneBricksBlock.hpp similarity index 50% rename from LiteLoader/include/llapi/mc/StoneBrickBlock.hpp rename to LiteLoader/include/llapi/mc/StoneBricksBlock.hpp index 6f434e27f6..bf679b90ae 100644 --- a/LiteLoader/include/llapi/mc/StoneBrickBlock.hpp +++ b/LiteLoader/include/llapi/mc/StoneBricksBlock.hpp @@ -1,5 +1,5 @@ /** - * @file StoneBrickBlock.hpp + * @file StoneBricksBlock.hpp * */ #pragma once @@ -8,25 +8,20 @@ #include "BlockLegacy.hpp" #define BEFORE_EXTRA -// Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC class StoneBrickBlock. - * - */ -class StoneBrickBlock : public BlockLegacy { + +class StoneBricksBlock : public BlockLegacy { #define AFTER_EXTRA -// Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_STONEBRICKBLOCK +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_STONEBRICKSBLOCK public: - class StoneBrickBlock& operator=(class StoneBrickBlock const &) = delete; - StoneBrickBlock(class StoneBrickBlock const &) = delete; - StoneBrickBlock() = delete; + class StoneBricksBlock& operator=(class StoneBricksBlock const &) = delete; + StoneBricksBlock(class StoneBricksBlock const &) = delete; + StoneBricksBlock() = delete; #endif public: @@ -40,16 +35,21 @@ class StoneBrickBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +61,10 @@ class StoneBrickBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +96,10 @@ class StoneBrickBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,138 +126,133 @@ class StoneBrickBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 102 + * @symbol ?asItemInstance\@StoneBricksBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ - virtual void __unk_vfn_82(); + virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@StoneBrickBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 - * @symbol ?buildDescriptionId\@StoneBrickBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @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 135 - * @symbol ?isAuxValueRelevantForPicking\@StoneBrickBlock\@\@UEBA_NXZ + * @vftbl 133 + * @symbol ?isAuxValueRelevantForPicking\@StoneBricksBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 160 - * @symbol ?tryGetInfested\@StoneBrickBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z + * @vftbl 158 + * @symbol ?tryGetInfested\@StoneBricksBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetInfested(class Block const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 - * @symbol ?getResourceItem\@StoneBrickBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@StoneBricksBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 - * @symbol ?getSilkTouchItemInstance\@StoneBrickBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@StoneBricksBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0StoneBrickBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0StoneBricksBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ - MCAPI StoneBrickBlock(std::string const &, int, class Material const &); + MCAPI StoneBricksBlock(std::string const &, int, class Material const &); }; diff --git a/LiteLoader/include/llapi/mc/StoneButtonBlock.hpp b/LiteLoader/include/llapi/mc/StoneButtonBlock.hpp index 6b6d668638..5ad6ab6552 100644 --- a/LiteLoader/include/llapi/mc/StoneButtonBlock.hpp +++ b/LiteLoader/include/llapi/mc/StoneButtonBlock.hpp @@ -40,16 +40,21 @@ class StoneButtonBlock : public ButtonBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class StoneButtonBlock : public ButtonBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class StoneButtonBlock : public ButtonBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,105 +131,100 @@ class StoneButtonBlock : public ButtonBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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/StoneCutterContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/StoneCutterContainerScreenValidator.hpp index b55bcb6fa9..4f2707f977 100644 --- a/LiteLoader/include/llapi/mc/StoneCutterContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/StoneCutterContainerScreenValidator.hpp @@ -53,4 +53,12 @@ class StoneCutterContainerScreenValidator { */ MCAPI StoneCutterContainerScreenValidator(); +//private: + /** + * @symbol ?_recipeMatches\@StoneCutterContainerScreenValidator\@\@AEBA_NAEBVContainerScreenContext\@\@AEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@AEBVItemStack\@\@\@Z + */ + MCAPI bool _recipeMatches(class ContainerScreenContext const &, class TypedServerNetId const &, class ItemStack const &) const; + +private: + }; diff --git a/LiteLoader/include/llapi/mc/StoneSlabBlock.hpp b/LiteLoader/include/llapi/mc/StoneSlabBlock.hpp index 27b772a79e..e7d2ec06da 100644 --- a/LiteLoader/include/llapi/mc/StoneSlabBlock.hpp +++ b/LiteLoader/include/llapi/mc/StoneSlabBlock.hpp @@ -40,16 +40,21 @@ class StoneSlabBlock : public SlabBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class StoneSlabBlock : public SlabBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class StoneSlabBlock : public SlabBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,142 +131,137 @@ class StoneSlabBlock : public SlabBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** * @vftbl 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 55 * @symbol ?isValidAuxValue\@StoneSlabBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; + /** + * @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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@StoneSlabBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@StoneSlabBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@StoneSlabBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 186 + * @vftbl 185 * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@StoneSlabBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @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 deda0a6ef7..58e5003aa7 100644 --- a/LiteLoader/include/llapi/mc/StoneSlabBlock2.hpp +++ b/LiteLoader/include/llapi/mc/StoneSlabBlock2.hpp @@ -40,16 +40,21 @@ class StoneSlabBlock2 : public SlabBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class StoneSlabBlock2 : public SlabBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class StoneSlabBlock2 : public SlabBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,142 +131,137 @@ class StoneSlabBlock2 : public SlabBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** * @vftbl 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 55 * @symbol ?isValidAuxValue\@StoneSlabBlock2\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; + /** + * @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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@StoneSlabBlock2\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@StoneSlabBlock2\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@StoneSlabBlock2\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 186 + * @vftbl 185 * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@StoneSlabBlock2\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @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 970c347d19..324a3c1071 100644 --- a/LiteLoader/include/llapi/mc/StoneSlabBlock3.hpp +++ b/LiteLoader/include/llapi/mc/StoneSlabBlock3.hpp @@ -40,16 +40,21 @@ class StoneSlabBlock3 : public SlabBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class StoneSlabBlock3 : public SlabBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class StoneSlabBlock3 : public SlabBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,142 +131,137 @@ class StoneSlabBlock3 : public SlabBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** * @vftbl 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 55 * @symbol ?isValidAuxValue\@StoneSlabBlock3\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; + /** + * @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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@StoneSlabBlock3\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@StoneSlabBlock3\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@StoneSlabBlock3\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 186 + * @vftbl 185 * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@StoneSlabBlock3\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @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 69e7a94ca8..fc08807a2f 100644 --- a/LiteLoader/include/llapi/mc/StoneSlabBlock4.hpp +++ b/LiteLoader/include/llapi/mc/StoneSlabBlock4.hpp @@ -40,16 +40,21 @@ class StoneSlabBlock4 : public SlabBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class StoneSlabBlock4 : public SlabBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class StoneSlabBlock4 : public SlabBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,142 +131,137 @@ class StoneSlabBlock4 : public SlabBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** * @vftbl 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 55 * @symbol ?isValidAuxValue\@StoneSlabBlock4\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; + /** + * @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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@StoneSlabBlock4\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@StoneSlabBlock4\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@StoneSlabBlock4\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 186 + * @vftbl 185 * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@StoneSlabBlock4\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @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 64e1348f77..15b63926f1 100644 --- a/LiteLoader/include/llapi/mc/StoneSlabBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/StoneSlabBlockItem.hpp @@ -36,11 +36,6 @@ class StoneSlabBlockItem : public DeprecatedSlabBlockItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class StoneSlabBlockItem : public DeprecatedSlabBlockItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 45 * @symbol ?getLevelDataForAuxValue\@StoneSlabBlockItem\@\@UEBAHH\@Z @@ -106,5 +106,15 @@ class StoneSlabBlockItem : public DeprecatedSlabBlockItem { * @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(); }; diff --git a/LiteLoader/include/llapi/mc/StonecutterBlock.hpp b/LiteLoader/include/llapi/mc/StonecutterBlock.hpp index 167b63e743..f802b0af3c 100644 --- a/LiteLoader/include/llapi/mc/StonecutterBlock.hpp +++ b/LiteLoader/include/llapi/mc/StonecutterBlock.hpp @@ -45,16 +45,26 @@ class StonecutterBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); + /** + * @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 + */ + virtual void __unk_vfn_28(); /** * @vftbl 29 * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +76,10 @@ class StonecutterBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +111,10 @@ class StonecutterBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,15 +141,15 @@ class StonecutterBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -147,121 +157,116 @@ class StonecutterBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@StonecutterBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 101 + * @vftbl 100 * @symbol ?playerWillDestroy\@StonecutterBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@StonecutterBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@StonecutterBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 + * @vftbl 187 * @symbol ?playerDestroy\@StonecutterBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@StonecutterBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/StopSoundPacket.hpp b/LiteLoader/include/llapi/mc/StopSoundPacket.hpp index 29e7f06ee5..0479e7180f 100644 --- a/LiteLoader/include/llapi/mc/StopSoundPacket.hpp +++ b/LiteLoader/include/llapi/mc/StopSoundPacket.hpp @@ -51,9 +51,9 @@ class StopSoundPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@StopSoundPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@StopSoundPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_STOPSOUNDPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/StrictEntityContextOwner.hpp b/LiteLoader/include/llapi/mc/StrictEntityContextOwner.hpp index 3757f9c202..c1ed998a1b 100644 --- a/LiteLoader/include/llapi/mc/StrictEntityContextOwner.hpp +++ b/LiteLoader/include/llapi/mc/StrictEntityContextOwner.hpp @@ -27,6 +27,10 @@ class StrictEntityContextOwner { #endif public: + /** + * @symbol ??0StrictEntityContextOwner\@\@QEAA\@AEAVEntityRegistryBase\@\@VEntityId\@\@\@Z + */ + MCAPI StrictEntityContextOwner(class EntityRegistryBase &, class EntityId); /** * @symbol ??0StrictEntityContextOwner\@\@QEAA\@$$QEAV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/Strider.hpp b/LiteLoader/include/llapi/mc/Strider.hpp index 8f90d662a5..9ad5fa07b0 100644 --- a/LiteLoader/include/llapi/mc/Strider.hpp +++ b/LiteLoader/include/llapi/mc/Strider.hpp @@ -37,150 +37,145 @@ class Strider : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@Strider\@\@MEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 - */ - virtual void __unk_vfn_243(); - /** - * @vftbl 249 + * @vftbl 241 * @symbol ?getNextStep\@Strider\@\@MEAAMM\@Z */ virtual float getNextStep(float); /** - * @vftbl 259 + * @vftbl 251 * @symbol ?shouldTryMakeStepSound\@Strider\@\@MEAA_NXZ */ virtual bool shouldTryMakeStepSound(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 266 + * @vftbl 258 * @symbol ?_playStepSound\@Strider\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 337 + * @vftbl 329 * @symbol ?_getWalkTargetValue\@Strider\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0Strider\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/StringTag.hpp b/LiteLoader/include/llapi/mc/StringTag.hpp index b20dbda142..a70aa22b12 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 ?write\@StringTag\@\@UEBAXAEAVIDataOutput\@\@\@Z + * @symbol __unk_vfn_2 */ - virtual void write(class IDataOutput &) const; + virtual void __unk_vfn_2(); /** * @vftbl 3 * @symbol ?load\@StringTag\@\@UEAAXAEAVIDataInput\@\@\@Z @@ -79,6 +79,10 @@ 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 7ec71bbd9a..0285c69ac7 100644 --- a/LiteLoader/include/llapi/mc/StrippedLogBlock.hpp +++ b/LiteLoader/include/llapi/mc/StrippedLogBlock.hpp @@ -40,16 +40,21 @@ class StrippedLogBlock : public RotatedPillarBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class StrippedLogBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class StrippedLogBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,117 +131,112 @@ class StrippedLogBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@StrippedLogBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 186 + * @vftbl 185 * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 191 + * @vftbl 190 * @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 87129bc4ca..2598df982b 100644 --- a/LiteLoader/include/llapi/mc/StructureBlock.hpp +++ b/LiteLoader/include/llapi/mc/StructureBlock.hpp @@ -40,16 +40,21 @@ class StructureBlock : public ActorBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class StructureBlock : public ActorBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class StructureBlock : public ActorBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,15 +131,15 @@ class StructureBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -142,69 +147,74 @@ class StructureBlock : public ActorBlock { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@StructureBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 73 + * @vftbl 72 * @symbol ?onRedstoneUpdate\@StructureBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@StructureBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -212,46 +222,36 @@ class StructureBlock : public ActorBlock { 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 ?onPlace\@StructureBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@StructureBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 190 + * @vftbl 189 * @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 b88597122e..90a252266f 100644 --- a/LiteLoader/include/llapi/mc/StructureBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/StructureBlockActor.hpp @@ -86,17 +86,17 @@ class StructureBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 38 + * @symbol __unk_vfn_38 */ - virtual void __unk_vfn_36(); + virtual void __unk_vfn_38(); /** - * @vftbl 37 + * @vftbl 39 * @symbol ?_getUpdatePacket\@StructureBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 38 + * @vftbl 40 * @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 dd7b3441fb..7223385dce 100644 --- a/LiteLoader/include/llapi/mc/StructureBlockUpdatePacket.hpp +++ b/LiteLoader/include/llapi/mc/StructureBlockUpdatePacket.hpp @@ -50,16 +50,16 @@ class StructureBlockUpdatePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@StructureBlockUpdatePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@StructureBlockUpdatePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); - /** - * @symbol ??0StructureBlockUpdatePacket\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI StructureBlockUpdatePacket(class StructureBlockUpdatePacket const &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0StructureBlockUpdatePacket\@\@QEAA\@XZ */ MCAPI StructureBlockUpdatePacket(); + /** + * @symbol ??0StructureBlockUpdatePacket\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI StructureBlockUpdatePacket(class StructureBlockUpdatePacket const &); }; diff --git a/LiteLoader/include/llapi/mc/StructureManager.hpp b/LiteLoader/include/llapi/mc/StructureManager.hpp index 0395b5c6e2..51d9ded98a 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?$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 ?_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 ?_placeSegment\@StructureManager\@\@AEAA_NAEAVStructureAnimationData\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/StructurePiece.hpp b/LiteLoader/include/llapi/mc/StructurePiece.hpp index d0e3078d75..79e67c4750 100644 --- a/LiteLoader/include/llapi/mc/StructurePiece.hpp +++ b/LiteLoader/include/llapi/mc/StructurePiece.hpp @@ -51,7 +51,7 @@ class StructurePiece { virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** * @vftbl 4 - * @symbol ?postProcess\@NBCastleSmallCorridorLeftTurnPiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @symbol ?postProcess\@DesertPyramidPiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &) = 0; /** diff --git a/LiteLoader/include/llapi/mc/StructurePoolElement.hpp b/LiteLoader/include/llapi/mc/StructurePoolElement.hpp index dcb959b07d..bdbc95f50e 100644 --- a/LiteLoader/include/llapi/mc/StructurePoolElement.hpp +++ b/LiteLoader/include/llapi/mc/StructurePoolElement.hpp @@ -103,10 +103,6 @@ class LazyTemplate { */ MCVAPI ~StructurePoolElement(); #endif - /** - * @symbol ??0StructurePoolElement\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBV?$vector\@V?$unique_ptr\@VStructurePoolBlockRule\@\@U?$default_delete\@VStructurePoolBlockRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolBlockRule\@\@U?$default_delete\@VStructurePoolBlockRule\@\@\@std\@\@\@std\@\@\@2\@\@4\@PEBV?$vector\@V?$unique_ptr\@VStructurePoolBlockTagRule\@\@U?$default_delete\@VStructurePoolBlockTagRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolBlockTagRule\@\@U?$default_delete\@VStructurePoolBlockTagRule\@\@\@std\@\@\@std\@\@\@2\@\@4\@PEBV?$vector\@V?$unique_ptr\@VStructurePoolActorRule\@\@U?$default_delete\@VStructurePoolActorRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolActorRule\@\@U?$default_delete\@VStructurePoolActorRule\@\@\@std\@\@\@std\@\@\@2\@\@4\@W4Projection\@\@W4PostProcessSettings\@\@\@Z - */ - MCAPI StructurePoolElement(class gsl::not_null>, std::string const &, std::vector> const *, std::vector> const *, std::vector> const *, enum class Projection, enum class PostProcessSettings); /** * @symbol ??0StructurePoolElement\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Projection\@\@W4PostProcessSettings\@\@\@Z */ @@ -115,6 +111,14 @@ class LazyTemplate { * @symbol ??0StructurePoolElement\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UStructurePoolElementSettings\@\@\@Z */ MCAPI StructurePoolElement(class gsl::not_null>, std::string const &, struct StructurePoolElementSettings); + /** + * @symbol ??0StructurePoolElement\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBV?$vector\@V?$unique_ptr\@VStructurePoolBlockRule\@\@U?$default_delete\@VStructurePoolBlockRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolBlockRule\@\@U?$default_delete\@VStructurePoolBlockRule\@\@\@std\@\@\@std\@\@\@2\@\@4\@PEBV?$vector\@V?$unique_ptr\@VStructurePoolBlockTagRule\@\@U?$default_delete\@VStructurePoolBlockTagRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolBlockTagRule\@\@U?$default_delete\@VStructurePoolBlockTagRule\@\@\@std\@\@\@std\@\@\@2\@\@4\@PEBV?$vector\@V?$unique_ptr\@VStructurePoolActorRule\@\@U?$default_delete\@VStructurePoolActorRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolActorRule\@\@U?$default_delete\@VStructurePoolActorRule\@\@\@std\@\@\@std\@\@\@2\@\@4\@W4Projection\@\@W4PostProcessSettings\@\@\@Z + */ + MCAPI StructurePoolElement(class gsl::not_null>, std::string const &, std::vector> const *, std::vector> const *, std::vector> const *, enum class Projection, enum class PostProcessSettings); + /** + * @symbol ?getLocation\@StructurePoolElement\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + */ + MCAPI std::string const & getLocation() const; //private: /** diff --git a/LiteLoader/include/llapi/mc/StructureTemplateDataRequestPacket.hpp b/LiteLoader/include/llapi/mc/StructureTemplateDataRequestPacket.hpp index c9820f2a9a..406244374c 100644 --- a/LiteLoader/include/llapi/mc/StructureTemplateDataRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/StructureTemplateDataRequestPacket.hpp @@ -51,9 +51,9 @@ class StructureTemplateDataRequestPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@StructureTemplateDataRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@StructureTemplateDataRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0StructureTemplateDataRequestPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/StructureTemplateDataResponsePacket.hpp b/LiteLoader/include/llapi/mc/StructureTemplateDataResponsePacket.hpp index 32452090ab..6fe474eecf 100644 --- a/LiteLoader/include/llapi/mc/StructureTemplateDataResponsePacket.hpp +++ b/LiteLoader/include/llapi/mc/StructureTemplateDataResponsePacket.hpp @@ -51,9 +51,9 @@ class StructureTemplateDataResponsePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@StructureTemplateDataResponsePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@StructureTemplateDataResponsePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_STRUCTURETEMPLATEDATARESPONSEPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/StructureVoid.hpp b/LiteLoader/include/llapi/mc/StructureVoidBlock.hpp similarity index 53% rename from LiteLoader/include/llapi/mc/StructureVoid.hpp rename to LiteLoader/include/llapi/mc/StructureVoidBlock.hpp index 3eb4adb07c..04a89fb028 100644 --- a/LiteLoader/include/llapi/mc/StructureVoid.hpp +++ b/LiteLoader/include/llapi/mc/StructureVoidBlock.hpp @@ -1,5 +1,5 @@ /** - * @file StructureVoid.hpp + * @file StructureVoidBlock.hpp * */ #pragma once @@ -8,25 +8,20 @@ #include "BlockLegacy.hpp" #define BEFORE_EXTRA -// Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC class StructureVoid. - * - */ -class StructureVoid : public BlockLegacy { + +class StructureVoidBlock : public BlockLegacy { #define AFTER_EXTRA -// Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_STRUCTUREVOID +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_STRUCTUREVOIDBLOCK public: - class StructureVoid& operator=(class StructureVoid const &) = delete; - StructureVoid(class StructureVoid const &) = delete; - StructureVoid() = delete; + class StructureVoidBlock& operator=(class StructureVoidBlock const &) = delete; + StructureVoidBlock(class StructureVoidBlock const &) = delete; + StructureVoidBlock() = delete; #endif public: @@ -37,22 +32,22 @@ class StructureVoid : public BlockLegacy { virtual void __unk_vfn_0(); /** * @vftbl 5 - * @symbol ?getCollisionShape\@StructureVoid\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @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\@StructureVoid\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?isObstructingChests\@StructureVoidBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool isObstructingChests(class BlockSource &, class BlockPos const &, class Block const &) const; /** * @vftbl 10 - * @symbol ?getAABB\@StructureVoid\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @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 - * @symbol ?addCollisionShapes\@StructureVoid\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @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; /** @@ -60,16 +55,21 @@ class StructureVoid : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -81,10 +81,10 @@ class StructureVoid : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -116,10 +116,10 @@ class StructureVoid : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -146,123 +146,118 @@ class StructureVoid : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 68 + * @symbol ?checkIsPathable\@StructureVoidBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ - virtual void __unk_vfn_61(); + virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 69 - * @symbol ?checkIsPathable\@StructureVoid\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_STRUCTUREVOID + virtual void __unk_vfn_186(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_STRUCTUREVOIDBLOCK /** - * @symbol ?canBeSilkTouched\@StructureVoid\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@StructureVoidBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?canHaveExtraData\@StructureVoid\@\@UEBA_NXZ + * @symbol ?canHaveExtraData\@StructureVoidBlock\@\@UEBA_NXZ */ MCVAPI bool canHaveExtraData() const; #endif /** - * @symbol ??0StructureVoid\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0StructureVoidBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ - MCAPI StructureVoid(std::string const &, int); + MCAPI StructureVoidBlock(std::string const &, int); }; diff --git a/LiteLoader/include/llapi/mc/StubServerLocator.hpp b/LiteLoader/include/llapi/mc/StubServerLocator.hpp index 44b3d27ea3..fb0ed3c769 100644 --- a/LiteLoader/include/llapi/mc/StubServerLocator.hpp +++ b/LiteLoader/include/llapi/mc/StubServerLocator.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 @@ -45,14 +46,14 @@ class StubServerLocator { virtual void __unk_vfn_2(); /** * @vftbl 3 - * @symbol ?startAnnouncingServer\@StubServerLocator\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0W4GameType\@\@HH_N2W4TransportLayer\@\@\@Z + * @symbol ?startAnnouncingServer\@StubServerLocator\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0V?$NonOwnerPointer\@VAppPlatform\@\@\@Bedrock\@\@W4GameType\@\@HH_N3\@Z */ - virtual void startAnnouncingServer(std::string const &, std::string const &, enum class GameType, int, int, bool, bool, enum class TransportLayer); + virtual void startAnnouncingServer(std::string const &, std::string const &, class Bedrock::NonOwnerPointer, enum class GameType, int, int, bool, bool); /** * @vftbl 4 - * @symbol ?stopAnnouncingServer\@StubServerLocator\@\@UEAAXXZ + * @symbol ?stopAnnouncingServer\@StubServerLocator\@\@UEAAXV?$NonOwnerPointer\@VAppPlatform\@\@\@Bedrock\@\@\@Z */ - virtual void stopAnnouncingServer(); + virtual void stopAnnouncingServer(class Bedrock::NonOwnerPointer); /** * @vftbl 5 * @symbol ?startServerDiscovery\@StubServerLocator\@\@UEAAXUPortPair\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/SubBBsComponent.hpp b/LiteLoader/include/llapi/mc/SubBBsComponent.hpp index f747ecb117..e9a15e32e5 100644 --- a/LiteLoader/include/llapi/mc/SubBBsComponent.hpp +++ b/LiteLoader/include/llapi/mc/SubBBsComponent.hpp @@ -27,10 +27,6 @@ struct SubBBsComponent { #endif public: - /** - * @symbol ??4SubBBsComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z - */ - MCAPI struct SubBBsComponent & operator=(struct SubBBsComponent &&); /** * @symbol ??1SubBBsComponent\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/SubChunk.hpp b/LiteLoader/include/llapi/mc/SubChunk.hpp index fb02a0e036..61b05f12d5 100644 --- a/LiteLoader/include/llapi/mc/SubChunk.hpp +++ b/LiteLoader/include/llapi/mc/SubChunk.hpp @@ -29,14 +29,14 @@ struct SubChunk { #endif public: - /** - * @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\@PEBVBlock\@\@_N1AEAVSpinLock\@\@C\@Z + */ + MCAPI SubChunk(class Block const *, bool, bool, class SpinLock &, signed char); /** * @symbol ??0SubChunk\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/SubChunkPacket.hpp b/LiteLoader/include/llapi/mc/SubChunkPacket.hpp index 8600ffb399..8f0eb6d44e 100644 --- a/LiteLoader/include/llapi/mc/SubChunkPacket.hpp +++ b/LiteLoader/include/llapi/mc/SubChunkPacket.hpp @@ -53,22 +53,22 @@ class SubChunkPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SubChunkPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SubChunkPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SUBCHUNKPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~SubChunkPacket(); #endif - /** - * @symbol ??0SubChunkPacket\@\@QEAA\@AEBV?$AutomaticID\@VDimension\@\@H\@\@AEBVSubChunkPos\@\@_N\@Z - */ - MCAPI SubChunkPacket(class AutomaticID const &, class SubChunkPos const &, bool); /** * @symbol ??0SubChunkPacket\@\@QEAA\@XZ */ MCAPI SubChunkPacket(); + /** + * @symbol ??0SubChunkPacket\@\@QEAA\@AEBV?$AutomaticID\@VDimension\@\@H\@\@AEBVSubChunkPos\@\@_N\@Z + */ + MCAPI SubChunkPacket(class AutomaticID const &, class SubChunkPos const &, bool); }; diff --git a/LiteLoader/include/llapi/mc/SubChunkRelighter.hpp b/LiteLoader/include/llapi/mc/SubChunkRelighter.hpp index e574f806a0..c63331d165 100644 --- a/LiteLoader/include/llapi/mc/SubChunkRelighter.hpp +++ b/LiteLoader/include/llapi/mc/SubChunkRelighter.hpp @@ -37,22 +37,22 @@ class SubChunkRelighter { * @symbol ?_getAbsorption\@SubChunkRelighter\@\@QEBAPEAUSubChunk\@\@USubChunkLightIndex\@\@AEAE\@Z */ MCAPI struct SubChunk * _getAbsorption(struct SubChunkLightIndex, unsigned char &) const; - /** - * @symbol ?_propagateBlockLight\@SubChunkRelighter\@\@QEAAXXZ - */ - MCAPI void _propagateBlockLight(); /** * @symbol ?_propagateBlockLight\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@E\@Z */ MCAPI void _propagateBlockLight(struct SubChunkLightIndex, unsigned char); /** - * @symbol ?_propagateSkyLight\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@E\@Z + * @symbol ?_propagateBlockLight\@SubChunkRelighter\@\@QEAAXXZ */ - MCAPI void _propagateSkyLight(struct SubChunkLightIndex, unsigned char); + MCAPI void _propagateBlockLight(); /** * @symbol ?_propagateSkyLight\@SubChunkRelighter\@\@QEAAXXZ */ MCAPI void _propagateSkyLight(); + /** + * @symbol ?_propagateSkyLight\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@E\@Z + */ + MCAPI void _propagateSkyLight(struct SubChunkLightIndex, unsigned char); /** * @symbol ?_propagateSubtractiveBlockLight\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@E\@Z */ diff --git a/LiteLoader/include/llapi/mc/SubChunkRequestPacket.hpp b/LiteLoader/include/llapi/mc/SubChunkRequestPacket.hpp index 5704be4e23..af26fba2dc 100644 --- a/LiteLoader/include/llapi/mc/SubChunkRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/SubChunkRequestPacket.hpp @@ -51,9 +51,9 @@ class SubChunkRequestPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SubChunkRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SubChunkRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0SubChunkRequestPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/SubClientConnectionRequest.hpp b/LiteLoader/include/llapi/mc/SubClientConnectionRequest.hpp index a9b4488f81..f4a7f1990d 100644 --- a/LiteLoader/include/llapi/mc/SubClientConnectionRequest.hpp +++ b/LiteLoader/include/llapi/mc/SubClientConnectionRequest.hpp @@ -200,9 +200,9 @@ class SubClientConnectionRequest { */ MCAPI SubClientConnectionRequest(std::unique_ptr, std::string const &); /** - * @symbol ?validate\@SubClientConnectionRequest\@\@AEBA?AV?$unique_ptr\@VCertificate\@\@U?$default_delete\@VCertificate\@\@\@std\@\@\@std\@\@V23\@_J\@Z + * @symbol ?validate\@SubClientConnectionRequest\@\@AEBA?AV?$unique_ptr\@VCertificate\@\@U?$default_delete\@VCertificate\@\@\@std\@\@\@std\@\@V23\@_J_N\@Z */ - MCAPI std::unique_ptr validate(std::unique_ptr, __int64) const; + MCAPI std::unique_ptr validate(std::unique_ptr, __int64, bool) const; private: diff --git a/LiteLoader/include/llapi/mc/SubClientLoginPacket.hpp b/LiteLoader/include/llapi/mc/SubClientLoginPacket.hpp index 967a0fe6c7..e2488a1d9e 100644 --- a/LiteLoader/include/llapi/mc/SubClientLoginPacket.hpp +++ b/LiteLoader/include/llapi/mc/SubClientLoginPacket.hpp @@ -56,9 +56,9 @@ class SubClientLoginPacket : public Packet { virtual bool disallowBatching() const; /** * @vftbl 7 - * @symbol ?_read\@SubClientLoginPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SubClientLoginPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); /** * @symbol ??0SubClientLoginPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ReedBlock.hpp b/LiteLoader/include/llapi/mc/SugarCaneBlock.hpp similarity index 51% rename from LiteLoader/include/llapi/mc/ReedBlock.hpp rename to LiteLoader/include/llapi/mc/SugarCaneBlock.hpp index 128aaf938e..dc35843c5f 100644 --- a/LiteLoader/include/llapi/mc/ReedBlock.hpp +++ b/LiteLoader/include/llapi/mc/SugarCaneBlock.hpp @@ -1,5 +1,5 @@ /** - * @file ReedBlock.hpp + * @file SugarCaneBlock.hpp * */ #pragma once @@ -8,25 +8,20 @@ #include "BlockLegacy.hpp" #define BEFORE_EXTRA -// Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC class ReedBlock. - * - */ -class ReedBlock : public BlockLegacy { + +class SugarCaneBlock : public BlockLegacy { #define AFTER_EXTRA -// Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_REEDBLOCK +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SUGARCANEBLOCK public: - class ReedBlock& operator=(class ReedBlock const &) = delete; - ReedBlock(class ReedBlock const &) = delete; - ReedBlock() = delete; + class SugarCaneBlock& operator=(class SugarCaneBlock const &) = delete; + SugarCaneBlock(class SugarCaneBlock const &) = delete; + SugarCaneBlock() = delete; #endif public: @@ -37,7 +32,7 @@ class ReedBlock : public BlockLegacy { virtual void __unk_vfn_0(); /** * @vftbl 10 - * @symbol ?getAABB\@ReedBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @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; /** @@ -45,16 +40,21 @@ class ReedBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +66,10 @@ class ReedBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +101,10 @@ class ReedBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,15 +131,15 @@ class ReedBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -147,177 +147,172 @@ class ReedBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 - * @symbol ?canContainLiquid\@ReedBlock\@\@UEBA_NXZ + * @symbol ?canContainLiquid\@SugarCaneBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 - * @symbol ?onFertilized\@ReedBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 85 + * @symbol ?onFertilized\@SugarCaneBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 - * @symbol ?canBeFertilized\@ReedBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 87 + * @symbol ?canBeFertilized\@SugarCaneBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 - * @symbol ?mayPlace\@ReedBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 91 + * @symbol ?mayPlace\@SugarCaneBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@ReedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 98 + * @symbol ?neighborChanged\@SugarCaneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@ReedBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 102 + * @symbol ?asItemInstance\@SugarCaneBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 136 - * @symbol ?getColor\@ReedBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 134 + * @symbol ?getColor\@SugarCaneBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 137 - * @symbol ?getColor\@ReedBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 135 + * @symbol ?getColor\@SugarCaneBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 138 - * @symbol ?getColorAtPos\@ReedBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 136 + * @symbol ?getColorAtPos\@SugarCaneBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getColorAtPos(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 141 - * @symbol ?onGraphicsModeChanged\@ReedBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z + * @vftbl 139 + * @symbol ?onGraphicsModeChanged\@SugarCaneBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 - * @symbol ?tick\@ReedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 170 + * @symbol ?tick\@SugarCaneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol ?randomTick\@ReedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?randomTick\@SugarCaneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 - * @symbol ?canSurvive\@ReedBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol ?canSurvive\@SugarCaneBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 - * @symbol ?getResourceItem\@ReedBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@SugarCaneBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_REEDBLOCK +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SUGARCANEBLOCK /** - * @symbol ?canBeSilkTouched\@ReedBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@SugarCaneBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?waterSpreadCausesSpawn\@ReedBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@SugarCaneBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0ReedBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0SugarCaneBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ - MCAPI ReedBlock(std::string const &, int); + MCAPI SugarCaneBlock(std::string const &, int); //private: /** - * @symbol ?checkAlive\@ReedBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?checkAlive\@SugarCaneBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void checkAlive(class BlockSource &, class BlockPos const &) const; diff --git a/LiteLoader/include/llapi/mc/SuspiciousStewItem.hpp b/LiteLoader/include/llapi/mc/SuspiciousStewItem.hpp index 67475eddf6..45afe4d520 100644 --- a/LiteLoader/include/llapi/mc/SuspiciousStewItem.hpp +++ b/LiteLoader/include/llapi/mc/SuspiciousStewItem.hpp @@ -36,11 +36,6 @@ class SuspiciousStewItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class SuspiciousStewItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -106,6 +106,16 @@ class SuspiciousStewItem : public Item { * @symbol ?useTimeDepleted\@SuspiciousStewItem\@\@UEBA?AW4ItemUseMethod\@\@AEAVItemStack\@\@PEAVLevel\@\@PEAVPlayer\@\@\@Z */ virtual enum class ItemUseMethod useTimeDepleted(class ItemStack &, class Level *, class Player *) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SUSPICIOUSSTEWITEM /** * @symbol ?uniqueAuxValues\@SuspiciousStewItem\@\@UEBA_NXZ @@ -117,4 +127,12 @@ class SuspiciousStewItem : public Item { */ MCAPI static void applyStewEffect(class ItemStack const &, class Actor &); +//private: + /** + * @symbol ?_getStewEffects\@SuspiciousStewItem\@\@CAAEBV?$array\@VMobEffectInstance\@\@$0L\@\@std\@\@XZ + */ + MCAPI static class std::array const & _getStewEffects(); + +private: + }; diff --git a/LiteLoader/include/llapi/mc/SweetBerryBushBlock.hpp b/LiteLoader/include/llapi/mc/SweetBerryBushBlock.hpp index 73d8e1e613..ffa5c41b47 100644 --- a/LiteLoader/include/llapi/mc/SweetBerryBushBlock.hpp +++ b/LiteLoader/include/llapi/mc/SweetBerryBushBlock.hpp @@ -5,7 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "BlockLegacy.hpp" +#include "BushBlock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +16,7 @@ * @brief MC class SweetBerryBushBlock. * */ -class SweetBerryBushBlock : public BlockLegacy { +class SweetBerryBushBlock : public BushBlock { #define AFTER_EXTRA // Add Member There @@ -50,16 +50,21 @@ class SweetBerryBushBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -71,10 +76,10 @@ class SweetBerryBushBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +111,10 @@ class SweetBerryBushBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,15 +141,15 @@ class SweetBerryBushBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -152,186 +157,181 @@ class SweetBerryBushBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@SweetBerryBushBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 69 + * @vftbl 68 * @symbol ?checkIsPathable\@SweetBerryBushBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@SweetBerryBushBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@SweetBerryBushBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@SweetBerryBushBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 93 + * @vftbl 92 * @symbol ?mayPlaceOn\@SweetBerryBushBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 101 * @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 103 + * @vftbl 102 * @symbol ?asItemInstance\@SweetBerryBushBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 109 + * @vftbl 108 * @symbol ?attack\@SweetBerryBushBlock\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ virtual bool attack(class Player *, class BlockPos const &) const; /** - * @vftbl 113 + * @vftbl 112 * @symbol ?entityInside\@SweetBerryBushBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 118 + * @vftbl 117 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@SweetBerryBushBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@SweetBerryBushBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 159 + * @vftbl 157 * @symbol ?dealsContactDamage\@SweetBerryBushBlock\@\@UEBA_NAEBVActor\@\@AEBVBlock\@\@_N\@Z */ virtual bool dealsContactDamage(class Actor const &, class Block const &, bool) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 173 + * @vftbl 171 * @symbol ?randomTick\@SweetBerryBushBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@SweetBerryBushBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@SweetBerryBushBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 181 + * @vftbl 179 * @symbol ?getRenderLayer\@SweetBerryBushBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 182 + * @vftbl 180 * @symbol ?getRenderLayer\@SweetBerryBushBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@SweetBerryBushBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/SwimControlSystem.hpp b/LiteLoader/include/llapi/mc/SwimControlSystem.hpp index a920645bd1..a62f696f2e 100644 --- a/LiteLoader/include/llapi/mc/SwimControlSystem.hpp +++ b/LiteLoader/include/llapi/mc/SwimControlSystem.hpp @@ -28,10 +28,6 @@ class SwimControlSystem { * @symbol ?create\@SwimControlSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); - /** - * @symbol ?createSideBySide\@SwimControlSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSideBySide(); /** * @symbol ?tick\@SwimControlSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUSynchedActorDataComponent\@\@AEBUAbilitiesComponent\@\@AEBUActorRotationComponent\@\@AEBUMoveInputComponent\@\@AEAUStateVectorComponent\@\@AEBVIConstBlockSource\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SwimTriggerSystem.hpp b/LiteLoader/include/llapi/mc/SwimTriggerSystem.hpp index 20c2c8f74b..5dda10beb7 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\@\@UPlayerGameTypeComponent\@\@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\@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\@\@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 */ - 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, 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\@\@UPlayerGameTypeComponent\@\@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\@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\@\@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 */ - 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, 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 71b3008d80..f189b4b464 100644 --- a/LiteLoader/include/llapi/mc/SyncActorPropertyPacket.hpp +++ b/LiteLoader/include/llapi/mc/SyncActorPropertyPacket.hpp @@ -51,27 +51,27 @@ class SyncActorPropertyPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 4 - * @symbol ?readExtended\@SyncActorPropertyPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@SyncActorPropertyPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult read(class ReadOnlyBinaryStream &); /** * @vftbl 7 - * @symbol ?_read\@SyncActorPropertyPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SyncActorPropertyPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SYNCACTORPROPERTYPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~SyncActorPropertyPacket(); #endif - /** - * @symbol ??0SyncActorPropertyPacket\@\@QEAA\@XZ - */ - MCAPI SyncActorPropertyPacket(); /** * @symbol ??0SyncActorPropertyPacket\@\@QEAA\@AEBVHashedString\@\@AEBVPropertyGroupManager\@\@\@Z */ MCAPI SyncActorPropertyPacket(class HashedString const &, class PropertyGroupManager const &); + /** + * @symbol ??0SyncActorPropertyPacket\@\@QEAA\@XZ + */ + MCAPI SyncActorPropertyPacket(); }; diff --git a/LiteLoader/include/llapi/mc/SynchedActorData.hpp b/LiteLoader/include/llapi/mc/SynchedActorData.hpp index 242a4b64c5..e0a0f8bdf8 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\@XZ - */ - MCAPI SynchedActorData(); /** * @symbol ??0SynchedActorData\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI SynchedActorData(class SynchedActorData &&); + /** + * @symbol ??0SynchedActorData\@\@QEAA\@XZ + */ + MCAPI SynchedActorData(); /** * @symbol ?_clone\@SynchedActorData\@\@QEBA?AV1\@XZ */ diff --git a/LiteLoader/include/llapi/mc/SystemInfo.hpp b/LiteLoader/include/llapi/mc/SystemInfo.hpp index f57a5574c3..138152dd8c 100644 --- a/LiteLoader/include/llapi/mc/SystemInfo.hpp +++ b/LiteLoader/include/llapi/mc/SystemInfo.hpp @@ -21,17 +21,13 @@ struct SystemInfo { #undef AFTER_EXTRA public: /** - * @symbol ??0SystemInfo\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0SystemInfo\@\@QEAA\@XZ */ - MCAPI SystemInfo(struct SystemInfo &&); + 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 b81c47d3d9..4cd4d0bbc2 100644 --- a/LiteLoader/include/llapi/mc/Tadpole.hpp +++ b/LiteLoader/include/llapi/mc/Tadpole.hpp @@ -40,132 +40,127 @@ class Tadpole : public WaterAnimal { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_267(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_293(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_297(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_343(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 - */ - virtual void __unk_vfn_351(); - /** - * @vftbl 353 + * @vftbl 345 * @symbol ?getFlopVerticalVelocityFactor\@Tadpole\@\@UEBAMXZ */ virtual float getFlopVerticalVelocityFactor() const; /** - * @vftbl 354 + * @vftbl 346 * @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 c478ad3000..c77ea8de2f 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 ?write\@StringTag\@\@UEBAXAEAVIDataOutput\@\@\@Z + * @symbol __unk_vfn_2 */ - virtual void write(class IDataOutput &) const = 0; + virtual void __unk_vfn_2() = 0; /** * @vftbl 3 - * @symbol ?load\@StringTag\@\@UEAAXAEAVIDataInput\@\@\@Z + * @symbol ?load\@DoubleTag\@\@UEAAXAEAVIDataInput\@\@\@Z */ virtual void load(class IDataInput &) = 0; /** * @vftbl 4 - * @symbol ?toString\@StringTag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?toString\@DoubleTag\@\@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\@StringTag\@\@UEBA?AW4Type\@Tag\@\@XZ + * @symbol ?getId\@DoubleTag\@\@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\@StringTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?copy\@DoubleTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr copy() const = 0; /** * @vftbl 10 - * @symbol ?hash\@StringTag\@\@UEBA_KXZ + * @symbol ?hash\@DoubleTag\@\@UEBA_KXZ */ virtual unsigned __int64 hash() const = 0; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TAG diff --git a/LiteLoader/include/llapi/mc/TakeItemActorPacket.hpp b/LiteLoader/include/llapi/mc/TakeItemActorPacket.hpp index 2f3989e229..65e71f9ea2 100644 --- a/LiteLoader/include/llapi/mc/TakeItemActorPacket.hpp +++ b/LiteLoader/include/llapi/mc/TakeItemActorPacket.hpp @@ -51,22 +51,22 @@ class TakeItemActorPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@TakeItemActorPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@TakeItemActorPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TAKEITEMACTORPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~TakeItemActorPacket(); #endif - /** - * @symbol ??0TakeItemActorPacket\@\@QEAA\@VActorRuntimeID\@\@0\@Z - */ - MCAPI TakeItemActorPacket(class ActorRuntimeID, class ActorRuntimeID); /** * @symbol ??0TakeItemActorPacket\@\@QEAA\@XZ */ MCAPI TakeItemActorPacket(); + /** + * @symbol ??0TakeItemActorPacket\@\@QEAA\@VActorRuntimeID\@\@0\@Z + */ + MCAPI TakeItemActorPacket(class ActorRuntimeID, class ActorRuntimeID); }; diff --git a/LiteLoader/include/llapi/mc/TallGrass.hpp b/LiteLoader/include/llapi/mc/TallGrassBlock.hpp similarity index 52% rename from LiteLoader/include/llapi/mc/TallGrass.hpp rename to LiteLoader/include/llapi/mc/TallGrassBlock.hpp index 7d651b074c..e683ff9c09 100644 --- a/LiteLoader/include/llapi/mc/TallGrass.hpp +++ b/LiteLoader/include/llapi/mc/TallGrassBlock.hpp @@ -1,5 +1,5 @@ /** - * @file TallGrass.hpp + * @file TallGrassBlock.hpp * */ #pragma once @@ -8,25 +8,20 @@ #include "BushBlock.hpp" #define BEFORE_EXTRA -// Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC class TallGrass. - * - */ -class TallGrass : public BushBlock { + +class TallGrassBlock : public BushBlock { #define AFTER_EXTRA -// Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_TALLGRASS +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_TALLGRASSBLOCK public: - class TallGrass& operator=(class TallGrass const &) = delete; - TallGrass(class TallGrass const &) = delete; - TallGrass() = delete; + class TallGrassBlock& operator=(class TallGrassBlock const &) = delete; + TallGrassBlock(class TallGrassBlock const &) = delete; + TallGrassBlock() = delete; #endif public: @@ -37,12 +32,12 @@ class TallGrass : public BushBlock { virtual void __unk_vfn_0(); /** * @vftbl 8 - * @symbol ?randomlyModifyPosition\@TallGrass\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z + * @symbol ?randomlyModifyPosition\@TallGrassBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** * @vftbl 10 - * @symbol ?getAABB\@TallGrass\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @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; /** @@ -50,16 +45,21 @@ class TallGrass : public BushBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -71,10 +71,10 @@ class TallGrass : public BushBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +106,10 @@ class TallGrass : public BushBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,15 +136,15 @@ class TallGrass : public BushBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -152,183 +152,178 @@ class TallGrass : public BushBlock { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 - * @symbol ?canContainLiquid\@TallGrass\@\@UEBA_NXZ + * @symbol ?canContainLiquid\@TallGrassBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 - * @symbol ?onFertilized\@TallGrass\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 85 + * @symbol ?onFertilized\@TallGrassBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 - * @symbol ?mayConsumeFertilizer\@TallGrass\@\@UEBA_NAEAVBlockSource\@\@\@Z + * @vftbl 86 + * @symbol ?mayConsumeFertilizer\@TallGrassBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 88 - * @symbol ?canBeFertilized\@TallGrass\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 87 + * @symbol ?canBeFertilized\@TallGrassBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 - * @symbol ?mayPlace\@TallGrass\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 91 + * @symbol ?mayPlace\@TallGrassBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@TallGrass\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 102 + * @symbol ?asItemInstance\@TallGrassBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 - * @symbol ?buildDescriptionId\@TallGrass\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @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 135 - * @symbol ?isAuxValueRelevantForPicking\@TallGrass\@\@UEBA_NXZ + * @vftbl 133 + * @symbol ?isAuxValueRelevantForPicking\@TallGrassBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 136 - * @symbol ?getColor\@TallGrass\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 134 + * @symbol ?getColor\@TallGrassBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 137 - * @symbol ?getColor\@TallGrass\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 135 + * @symbol ?getColor\@TallGrassBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 162 - * @symbol ?_addHardCodedBlockComponents\@TallGrass\@\@UEAAXXZ + * @vftbl 160 + * @symbol ?_addHardCodedBlockComponents\@TallGrassBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 - * @symbol ?canSurvive\@TallGrass\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol ?canSurvive\@TallGrassBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 181 - * @symbol ?getRenderLayer\@TallGrass\@\@UEBA?AW4BlockRenderLayer\@\@XZ + * @vftbl 179 + * @symbol ?getRenderLayer\@TallGrassBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 182 - * @symbol ?getRenderLayer\@TallGrass\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 180 + * @symbol ?getRenderLayer\@TallGrassBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol ?getMapColor\@TallGrass\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 185 + * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 - * @symbol ?playerDestroy\@TallGrass\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 187 + * @symbol ?playerDestroy\@TallGrassBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 - * @symbol ?getResourceItem\@TallGrass\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@TallGrassBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TALLGRASS +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TALLGRASSBLOCK /** - * @symbol ?canBeSilkTouched\@TallGrass\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@TallGrassBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; #endif /** - * @symbol ??0TallGrass\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0TallGrassBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ - MCAPI TallGrass(std::string const &, int); + MCAPI TallGrassBlock(std::string const &, int); }; diff --git a/LiteLoader/include/llapi/mc/TargetBlock.hpp b/LiteLoader/include/llapi/mc/TargetBlock.hpp index c783d1f4f8..bf4b3e13d4 100644 --- a/LiteLoader/include/llapi/mc/TargetBlock.hpp +++ b/LiteLoader/include/llapi/mc/TargetBlock.hpp @@ -45,16 +45,21 @@ class TargetBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class TargetBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class TargetBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,85 +136,90 @@ class TargetBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 51 + * @vftbl 50 * @symbol ?isSignalSource\@TargetBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 64 + * @vftbl 63 * @symbol ?shouldConnectToRedstone\@TargetBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@TargetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -217,44 +227,39 @@ class TargetBlock : public BlockLegacy { 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 ?onPlace\@TargetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@TargetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 + */ + virtual void __unk_vfn_173(); + /** + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_177(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 194 + * @symbol __unk_vfn_194 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_194(); /** * @vftbl 195 * @symbol __unk_vfn_195 @@ -275,11 +280,6 @@ class TargetBlock : public BlockLegacy { * @symbol __unk_vfn_198 */ virtual void __unk_vfn_198(); - /** - * @vftbl 199 - * @symbol __unk_vfn_199 - */ - virtual void __unk_vfn_199(); /** * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/TargetGoal.hpp b/LiteLoader/include/llapi/mc/TargetGoal.hpp index 179a6df15d..3e9b29675d 100644 --- a/LiteLoader/include/llapi/mc/TargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/TargetGoal.hpp @@ -36,7 +36,7 @@ class TargetGoal { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?canUse\@OwnerHurtTargetGoal\@\@UEAA_NXZ + * @symbol ?canUse\@OwnerHurtByTargetGoal\@\@UEAA_NXZ */ virtual bool canUse() = 0; /** @@ -90,14 +90,14 @@ class TargetGoal { */ MCVAPI ~TargetGoal(); #endif - /** - * @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); + /** + * @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); //protected: /** diff --git a/LiteLoader/include/llapi/mc/TaskQueueImpl.hpp b/LiteLoader/include/llapi/mc/TaskQueueImpl.hpp index 46d9546e2f..9e02811daf 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\@\@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 ?Initialize\@TaskQueueImpl\@\@QEAAJPEAUXTaskQueuePortObject\@\@0\@Z + */ + MCAPI long Initialize(struct XTaskQueuePortObject *, struct XTaskQueuePortObject *); /** * @symbol ??0TaskQueueImpl\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/TeleportCommand.hpp b/LiteLoader/include/llapi/mc/TeleportCommand.hpp index 6f89ec41e3..1fc1116e9a 100644 --- a/LiteLoader/include/llapi/mc/TeleportCommand.hpp +++ b/LiteLoader/include/llapi/mc/TeleportCommand.hpp @@ -62,18 +62,10 @@ enum class TeleportAnalysis; * @symbol ?getFacingDirection\@TeleportCommand\@\@AEBA?AW4FacingResult\@RotationCommandUtils\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEAVVec3\@\@PEAVActor\@\@\@Z */ MCAPI enum class RotationCommandUtils::FacingResult getFacingDirection(class CommandOrigin const &, class CommandOutput &, class Vec3 &, class Actor *) const; - /** - * @symbol ?actorToLocationTeleportAnalysis\@TeleportCommand\@\@CA?AW4TeleportAnalysis\@1\@AEBVCommandOrigin\@\@AEBVCommandArea\@\@AEAV4\@AEBVActor\@\@VVec3\@\@\@Z - */ - MCAPI static enum class TeleportCommand::TeleportAnalysis actorToLocationTeleportAnalysis(class CommandOrigin const &, class CommandArea const &, class CommandArea &, class Actor const &, class Vec3); /** * @symbol ?getCommandAreaForTargets\@TeleportCommand\@\@CA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVCommandOrigin\@\@AEBV?$CommandSelectorResults\@VActor\@\@\@\@VVec3\@\@H_N\@Z */ MCAPI static std::unique_ptr getCommandAreaForTargets(class CommandOrigin const &, class CommandSelectorResults const &, class Vec3, int, bool); - /** - * @symbol ?getSafetyAABB\@TeleportCommand\@\@CA?AVAABB\@\@AEBVActor\@\@VVec3\@\@\@Z - */ - MCAPI static class AABB getSafetyAABB(class Actor const &, class Vec3); private: diff --git a/LiteLoader/include/llapi/mc/TeleportCommandHelpers.hpp b/LiteLoader/include/llapi/mc/TeleportCommandHelpers.hpp new file mode 100644 index 0000000000..8c547f1767 --- /dev/null +++ b/LiteLoader/include/llapi/mc/TeleportCommandHelpers.hpp @@ -0,0 +1,28 @@ +/** + * @file TeleportCommandHelpers.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace TeleportCommandHelpers { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?actorToLocationTeleportAnalysis\@TeleportCommandHelpers\@\@YA?AW4TeleportAnalysis\@\@AEBVBlockSource\@\@AEBVActor\@\@VVec3\@\@\@Z + */ + MCAPI enum class TeleportAnalysis actorToLocationTeleportAnalysis(class BlockSource const &, class Actor const &, class Vec3); + /** + * @symbol ?getSafetyAABB\@TeleportCommandHelpers\@\@YA?AVAABB\@\@AEBVActor\@\@VVec3\@\@\@Z + */ + MCAPI class AABB getSafetyAABB(class Actor const &, class Vec3); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/TemplateStructurePiece.hpp b/LiteLoader/include/llapi/mc/TemplateStructurePiece.hpp index fb65df3698..74a82536c0 100644 --- a/LiteLoader/include/llapi/mc/TemplateStructurePiece.hpp +++ b/LiteLoader/include/llapi/mc/TemplateStructurePiece.hpp @@ -47,7 +47,7 @@ class TemplateStructurePiece : public StructurePiece { virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); /** * @vftbl 13 - * @symbol ?_handleDataMarker\@OceanRuinPiece\@OceanRuinPieces\@\@MEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @symbol ?_handleDataMarker\@EndCityPiece\@EndCityPieces\@\@MEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual void _handleDataMarker(std::string const &, class BlockPos const &, class BlockSource &, class Random &, class BoundingBox const &) = 0; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TEMPLATESTRUCTUREPIECE diff --git a/LiteLoader/include/llapi/mc/TextFilteringUtils.hpp b/LiteLoader/include/llapi/mc/TextFilteringUtils.hpp index 1be088af53..0085c8e9eb 100644 --- a/LiteLoader/include/llapi/mc/TextFilteringUtils.hpp +++ b/LiteLoader/include/llapi/mc/TextFilteringUtils.hpp @@ -28,20 +28,12 @@ class TextFilteringUtils { public: /** - * @symbol ?checkChatFilteringEventsAndSendToastIfClientWasMuted\@TextFilteringUtils\@\@SAXAEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@V?$not_null\@PEAVPacketSender\@\@\@gsl\@\@AEBVNetworkIdentifier\@\@AEBW4SubClientId\@\@\@Z + * @symbol ?checkChatFilteringEventsAndSendToastIfClientWasMuted\@TextFilteringUtils\@\@SAXAEBV?$vector\@W4TextFilteringEvent\@Safety\@\@V?$allocator\@W4TextFilteringEvent\@Safety\@\@\@std\@\@\@std\@\@V?$not_null\@PEAVPacketSender\@\@\@gsl\@\@AEBVNetworkIdentifier\@\@AEBW4SubClientId\@\@\@Z */ - MCAPI static void checkChatFilteringEventsAndSendToastIfClientWasMuted(std::vector const &, class gsl::not_null, class NetworkIdentifier const &, enum class SubClientId const &); + MCAPI static void checkChatFilteringEventsAndSendToastIfClientWasMuted(std::vector const &, class gsl::not_null, class NetworkIdentifier const &, enum class SubClientId const &); /** - * @symbol ?getFilterableStringsFromBlockEntity\@TextFilteringUtils\@\@SA?AV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@AEBVCompoundTag\@\@W4BlockActorType\@\@\@Z + * @symbol ?checkChatFilteringEventsForFlooding\@TextFilteringUtils\@\@SA_NAEBV?$vector\@W4TextFilteringEvent\@Safety\@\@V?$allocator\@W4TextFilteringEvent\@Safety\@\@\@std\@\@\@std\@\@\@Z */ - MCAPI static std::vector getFilterableStringsFromBlockEntity(class CompoundTag const &, enum class BlockActorType); - /** - * @symbol ?hasDeprecatedSignTag\@TextFilteringUtils\@\@SA_NAEBVCompoundTag\@\@\@Z - */ - MCAPI static bool hasDeprecatedSignTag(class CompoundTag const &); - /** - * @symbol ?setFilteredStringsOnBlockEntity\@TextFilteringUtils\@\@SAXAEAVCompoundTag\@\@W4BlockActorType\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z - */ - MCAPI static void setFilteredStringsOnBlockEntity(class CompoundTag &, enum class BlockActorType, std::vector); + MCAPI static bool checkChatFilteringEventsForFlooding(std::vector const &); }; diff --git a/LiteLoader/include/llapi/mc/TextPacket.hpp b/LiteLoader/include/llapi/mc/TextPacket.hpp index c3f69ca806..741369e575 100644 --- a/LiteLoader/include/llapi/mc/TextPacket.hpp +++ b/LiteLoader/include/llapi/mc/TextPacket.hpp @@ -53,9 +53,9 @@ class TextPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@TextPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@TextPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TEXTPACKET /** * @symbol __unk_destructor_-1 @@ -94,14 +94,14 @@ class TextPacket : public Packet { * @symbol ?createTextObjectMessage\@TextPacket\@\@SA?AV1\@AEBVResolvedTextObject\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z */ MCAPI static class TextPacket createTextObjectMessage(class ResolvedTextObject const &, std::string, std::string); - /** - * @symbol ?createTextObjectWhisperMessage\@TextPacket\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z - */ - MCAPI static class TextPacket createTextObjectWhisperMessage(std::string const &, std::string const &, std::string const &); /** * @symbol ?createTextObjectWhisperMessage\@TextPacket\@\@SA?AV1\@AEBVResolvedTextObject\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z */ MCAPI static class TextPacket createTextObjectWhisperMessage(class ResolvedTextObject const &, std::string const &, std::string const &); + /** + * @symbol ?createTextObjectWhisperMessage\@TextPacket\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z + */ + MCAPI static class TextPacket createTextObjectWhisperMessage(std::string const &, std::string const &, std::string const &); /** * @symbol ?createTranslated\@TextPacket\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@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\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ThinFenceBlock.hpp b/LiteLoader/include/llapi/mc/ThinFenceBlock.hpp index e159ad38d2..bd68fe5f16 100644 --- a/LiteLoader/include/llapi/mc/ThinFenceBlock.hpp +++ b/LiteLoader/include/llapi/mc/ThinFenceBlock.hpp @@ -70,16 +70,21 @@ class ThinFenceBlock : public BlockLegacy { * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -91,10 +96,10 @@ class ThinFenceBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -126,10 +131,10 @@ class ThinFenceBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -156,15 +161,15 @@ class ThinFenceBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -172,111 +177,106 @@ class ThinFenceBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@ThinFenceBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 66 + * @vftbl 65 * @symbol ?canBeUsedInCommands\@ThinFenceBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 96 + * @vftbl 95 * @symbol ?breaksFallingBlocks\@ThinFenceBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 143 + * @vftbl 141 * @symbol ?getVisualShapeInWorld\@ThinFenceBlock\@\@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 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 190 + * @vftbl 189 * @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 f5bf8343b7..93bd38658c 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\@XZ - */ - MCAPI ThirdPartyInfo(); /** * @symbol ??0ThirdPartyInfo\@\@QEAA\@AEBV0\@\@Z */ MCAPI ThirdPartyInfo(class ThirdPartyInfo const &); + /** + * @symbol ??0ThirdPartyInfo\@\@QEAA\@XZ + */ + MCAPI ThirdPartyInfo(); /** * @symbol ??1ThirdPartyInfo\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/Throwable.hpp b/LiteLoader/include/llapi/mc/Throwable.hpp index e6e0c8ea6c..5ff95aa08f 100644 --- a/LiteLoader/include/llapi/mc/Throwable.hpp +++ b/LiteLoader/include/llapi/mc/Throwable.hpp @@ -42,157 +42,152 @@ class Throwable : public PredictableProjectile { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 47 + * @vftbl 46 * @symbol ?lerpMotion\@Throwable\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void lerpMotion(class Vec3 const &); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 79 + * @vftbl 77 * @symbol ?getShadowHeightOffs\@Throwable\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 169 + * @vftbl 167 * @symbol ?getSourceUniqueID\@Throwable\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@Throwable\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@Throwable\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 276 + * @vftbl 268 * @symbol ?getThrowPower\@Throwable\@\@UEAAMXZ */ virtual float getThrowPower(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 269 + * @symbol __unk_vfn_269 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_269(); /** - * @vftbl 278 + * @vftbl 270 * @symbol ?getThrowUpAngleOffset\@Throwable\@\@MEAAMXZ */ virtual float getThrowUpAngleOffset(); /** - * @vftbl 279 + * @vftbl 271 * @symbol ?getGravity\@Throwable\@\@MEAAMXZ */ virtual float getGravity(); /** - * @vftbl 280 + * @vftbl 272 * @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 685a9b4d6f..3b5a54161c 100644 --- a/LiteLoader/include/llapi/mc/ThrowableItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/ThrowableItemComponent.hpp @@ -51,16 +51,11 @@ class ThrowableItemComponent { virtual void __unk_vfn_3(); /** * @vftbl 4 - * @symbol __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 * @symbol ?buildNetworkTag\@?$NetworkedItemComponent\@VThrowableItemComponent\@\@\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 5 * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VThrowableItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/ThrownEgg.hpp b/LiteLoader/include/llapi/mc/ThrownEgg.hpp index 23593aa08a..dc8a301d63 100644 --- a/LiteLoader/include/llapi/mc/ThrownEgg.hpp +++ b/LiteLoader/include/llapi/mc/ThrownEgg.hpp @@ -42,115 +42,110 @@ class ThrownEgg : public Throwable { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_267(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 269 + * @symbol __unk_vfn_269 */ - virtual void __unk_vfn_275(); - /** - * @vftbl 277 - * @symbol __unk_vfn_277 - */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_269(); /** * @symbol ??0ThrownEgg\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ThrownEnderpearl.hpp b/LiteLoader/include/llapi/mc/ThrownEnderpearl.hpp index 87ccd2ddf0..bf1bc61c45 100644 --- a/LiteLoader/include/llapi/mc/ThrownEnderpearl.hpp +++ b/LiteLoader/include/llapi/mc/ThrownEnderpearl.hpp @@ -42,115 +42,110 @@ class ThrownEnderpearl : public Throwable { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_267(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 269 + * @symbol __unk_vfn_269 */ - virtual void __unk_vfn_275(); - /** - * @vftbl 277 - * @symbol __unk_vfn_277 - */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_269(); /** * @symbol ??0ThrownEnderpearl\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ThrownIceBomb.hpp b/LiteLoader/include/llapi/mc/ThrownIceBomb.hpp index 3636c0ea17..b56dd03ba8 100644 --- a/LiteLoader/include/llapi/mc/ThrownIceBomb.hpp +++ b/LiteLoader/include/llapi/mc/ThrownIceBomb.hpp @@ -42,115 +42,110 @@ class ThrownIceBomb : public Throwable { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_267(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 269 + * @symbol __unk_vfn_269 */ - virtual void __unk_vfn_275(); - /** - * @vftbl 277 - * @symbol __unk_vfn_277 - */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_269(); /** * @symbol ??0ThrownIceBomb\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ThrownPotion.hpp b/LiteLoader/include/llapi/mc/ThrownPotion.hpp index e9a68eab97..e9686900db 100644 --- a/LiteLoader/include/llapi/mc/ThrownPotion.hpp +++ b/LiteLoader/include/llapi/mc/ThrownPotion.hpp @@ -42,135 +42,130 @@ class ThrownPotion : public Throwable { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 168 + * @vftbl 166 * @symbol ?queryEntityRenderer\@ThrownPotion\@\@UEBAAEBVHashedString\@\@XZ */ virtual class HashedString const & queryEntityRenderer() const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 232 + * @vftbl 224 * @symbol ?setAuxValue\@ThrownPotion\@\@UEAAXH\@Z */ virtual void setAuxValue(int); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@ThrownPotion\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@ThrownPotion\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 269 + * @symbol __unk_vfn_269 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_269(); /** * @symbol ??0ThrownPotion\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ThrownTrident.hpp b/LiteLoader/include/llapi/mc/ThrownTrident.hpp index 84ce2694ef..b161bc838a 100644 --- a/LiteLoader/include/llapi/mc/ThrownTrident.hpp +++ b/LiteLoader/include/llapi/mc/ThrownTrident.hpp @@ -47,147 +47,142 @@ class ThrownTrident : public AbstractArrow { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 - */ - virtual void __unk_vfn_88(); - /** - * @vftbl 89 + * @vftbl 87 * @symbol ?playerTouch\@ThrownTrident\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void playerTouch(class Player &); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 + */ + virtual void __unk_vfn_94(); + /** + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 129 + * @vftbl 127 * @symbol ?isEnchanted\@ThrownTrident\@\@UEBA_NXZ */ virtual bool isEnchanted() const; /** - * @vftbl 147 + * @vftbl 145 * @symbol ?despawn\@ThrownTrident\@\@UEAAXXZ */ virtual void despawn(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@ThrownTrident\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@ThrownTrident\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@ThrownTrident\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 276 + * @vftbl 268 * @symbol ?shoot\@ThrownTrident\@\@UEAAXAEBVVec3\@\@MM0\@Z */ virtual void shoot(class Vec3 const &, float, float, class Vec3 const &); /** - * @vftbl 278 + * @vftbl 270 * @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 0c273c50c9..4be18a6e88 100644 --- a/LiteLoader/include/llapi/mc/TickSyncPacket.hpp +++ b/LiteLoader/include/llapi/mc/TickSyncPacket.hpp @@ -52,9 +52,9 @@ class TickSyncPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@TickSyncPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@TickSyncPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 d86d8c1190..a766c89df9 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\@XZ - */ - MCAPI TickWorldComponent(); /** * @symbol ??0TickWorldComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI TickWorldComponent(class TickWorldComponent &&); + /** + * @symbol ??0TickWorldComponent\@\@QEAA\@XZ + */ + MCAPI TickWorldComponent(); /** * @symbol ?getChunkRadius\@TickWorldComponent\@\@QEBAIXZ */ diff --git a/LiteLoader/include/llapi/mc/TickingAreasLoadStatusPacket.hpp b/LiteLoader/include/llapi/mc/TickingAreasLoadStatusPacket.hpp index 8c404a1788..81d0c25a65 100644 --- a/LiteLoader/include/llapi/mc/TickingAreasLoadStatusPacket.hpp +++ b/LiteLoader/include/llapi/mc/TickingAreasLoadStatusPacket.hpp @@ -49,9 +49,9 @@ class TickingAreasLoadStatusPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@TickingAreasLoadStatusPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@TickingAreasLoadStatusPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TICKINGAREASLOADSTATUSPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/TntBlock.hpp b/LiteLoader/include/llapi/mc/TntBlock.hpp index 90bcaaa796..5793025122 100644 --- a/LiteLoader/include/llapi/mc/TntBlock.hpp +++ b/LiteLoader/include/llapi/mc/TntBlock.hpp @@ -40,16 +40,21 @@ class TntBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class TntBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class TntBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,167 +131,162 @@ class TntBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 70 + * @vftbl 69 * @symbol ?shouldDispense\@TntBlock\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@\@Z */ virtual bool shouldDispense(class BlockSource &, class Container &) const; /** - * @vftbl 71 + * @vftbl 70 * @symbol ?dispense\@TntBlock\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 73 + * @vftbl 72 * @symbol ?onRedstoneUpdate\@TntBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@TntBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 97 + * @vftbl 96 * @symbol ?destroy\@TntBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@PEAVActor\@\@\@Z */ virtual void destroy(class BlockSource &, class BlockPos const &, class Block const &, class Actor *) const; /** - * @vftbl 104 + * @vftbl 103 * @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 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@TntBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@TntBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 164 + * @vftbl 162 * @symbol ?onExploded\@TntBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ virtual void onExploded(class BlockSource &, class BlockPos const &, class Actor *) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@TntBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@TntBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @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 19f24d7ad2..0de2fafcc0 100644 --- a/LiteLoader/include/llapi/mc/ToastRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/ToastRequestPacket.hpp @@ -51,22 +51,22 @@ class ToastRequestPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ToastRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ToastRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TOASTREQUESTPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~ToastRequestPacket(); #endif - /** - * @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(); + /** + * @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 &); }; diff --git a/LiteLoader/include/llapi/mc/TopSnowBlock.hpp b/LiteLoader/include/llapi/mc/TopSnowBlock.hpp index 1c08b60d7b..9d02d52a5c 100644 --- a/LiteLoader/include/llapi/mc/TopSnowBlock.hpp +++ b/LiteLoader/include/llapi/mc/TopSnowBlock.hpp @@ -5,7 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "HeavyBlock.hpp" +#include "FallingBlock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +16,7 @@ * @brief MC class TopSnowBlock. * */ -class TopSnowBlock : public HeavyBlock { +class TopSnowBlock : public FallingBlock { #define AFTER_EXTRA // Add Member There @@ -50,16 +50,21 @@ class TopSnowBlock : public HeavyBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -72,14 +77,14 @@ class TopSnowBlock : public HeavyBlock { virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol __unk_vfn_34 + * @symbol ?isWaterBlocking\@TopSnowBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_34(); + virtual bool isWaterBlocking() const; /** * @vftbl 35 - * @symbol ?isWaterBlocking\@TopSnowBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_35 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -111,10 +116,10 @@ class TopSnowBlock : public HeavyBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -141,15 +146,15 @@ class TopSnowBlock : public HeavyBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -157,84 +162,84 @@ class TopSnowBlock : public HeavyBlock { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@TopSnowBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 69 + * @vftbl 68 * @symbol ?checkIsPathable\@TopSnowBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 84 + * @vftbl 83 * @symbol ?isPreservingMediumWhenPlaced\@TopSnowBlock\@\@UEBA_NPEBVBlockLegacy\@\@\@Z */ virtual bool isPreservingMediumWhenPlaced(class BlockLegacy const *) const; /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@TopSnowBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 94 + * @vftbl 93 * @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 96 + * @vftbl 95 * @symbol ?breaksFallingBlocks\@TopSnowBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@TopSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 101 + * @vftbl 100 * @symbol ?playerWillDestroy\@TopSnowBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 114 + * @vftbl 113 * @symbol ?canBeBuiltOver\@TopSnowBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlockItem\@\@\@Z */ virtual bool canBeBuiltOver(class BlockSource &, class BlockPos const &, class BlockItem const &) const; /** - * @vftbl 115 + * @vftbl 114 * @symbol ?canBeBuiltOver\@TopSnowBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canBeBuiltOver(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 122 + * @vftbl 121 * @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 @@ -242,131 +247,121 @@ class TopSnowBlock : public HeavyBlock { virtual void __unk_vfn_123(); /** * @vftbl 124 - * @symbol ?calcGroundFriction\@TopSnowBlock\@\@UEBAMAEBUIMobMovementProxy\@\@AEBVBlockPos\@\@\@Z - */ - virtual float calcGroundFriction(struct IMobMovementProxy const &, class BlockPos const &) const; - /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@TopSnowBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 164 + * @vftbl 162 * @symbol ?onExploded\@TopSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ virtual void onExploded(class BlockSource &, class BlockPos const &, class Actor *) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@TopSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@TopSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 + * @vftbl 171 * @symbol ?randomTick\@TopSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 + * @vftbl 187 * @symbol ?playerDestroy\@TopSnowBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@TopSnowBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@TopSnowBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 195 + * @vftbl 194 * @symbol ?getDustColor\@TopSnowBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 196 + * @vftbl 195 * @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 197 - * @symbol __unk_vfn_197 + * @vftbl 196 + * @symbol __unk_vfn_196 */ - virtual void __unk_vfn_197(); + virtual void __unk_vfn_196(); /** - * @vftbl 199 + * @vftbl 198 * @symbol ?isFreeToFall\@TopSnowBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isFreeToFall(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 200 + * @vftbl 199 * @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 dece9eb1b3..de073deca4 100644 --- a/LiteLoader/include/llapi/mc/TopSnowBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/TopSnowBlockItem.hpp @@ -36,11 +36,6 @@ class TopSnowBlockItem : public BlockItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class TopSnowBlockItem : public BlockItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 45 * @symbol ?getLevelDataForAuxValue\@TopSnowBlockItem\@\@UEBAHH\@Z @@ -107,7 +107,17 @@ class TopSnowBlockItem : public BlockItem { */ virtual void __unk_vfn_80(); /** - * @vftbl 132 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 134 * @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 4202fcdef9..0d48246c70 100644 --- a/LiteLoader/include/llapi/mc/TorchBlock.hpp +++ b/LiteLoader/include/llapi/mc/TorchBlock.hpp @@ -45,16 +45,21 @@ class TorchBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class TorchBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class TorchBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,15 +136,15 @@ class TorchBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -147,149 +152,144 @@ class TorchBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@TorchBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@TorchBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@TorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 133 + * @vftbl 131 * @symbol ?getIconYOffset\@TorchBlock\@\@UEBAHXZ */ virtual int getIconYOffset() const; /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@TorchBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@TorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 162 + * @vftbl 160 * @symbol ?_addHardCodedBlockComponents\@TorchBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@TorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@TorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@TorchBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 182 + * @vftbl 180 * @symbol ?getRenderLayer\@TorchBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #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 new file mode 100644 index 0000000000..253000f4a1 --- /dev/null +++ b/LiteLoader/include/llapi/mc/TorchflowerBlock.hpp @@ -0,0 +1,238 @@ +/** + * @file TorchflowerBlock.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "FlowerBlock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class TorchflowerBlock : public FlowerBlock { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_TORCHFLOWERBLOCK +public: + class TorchflowerBlock& operator=(class TorchflowerBlock const &) = delete; + TorchflowerBlock(class TorchflowerBlock const &) = delete; + TorchflowerBlock() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + 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(); + /** + * @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 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 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 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @vftbl 59 + * @symbol __unk_vfn_59 + */ + virtual void __unk_vfn_59(); + /** + * @vftbl 60 + * @symbol __unk_vfn_60 + */ + virtual void __unk_vfn_60(); + /** + * @vftbl 74 + * @symbol __unk_vfn_74 + */ + virtual void __unk_vfn_74(); + /** + * @vftbl 81 + * @symbol __unk_vfn_81 + */ + virtual void __unk_vfn_81(); + /** + * @vftbl 85 + * @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 + * @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 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); + /** + * @vftbl 123 + * @symbol __unk_vfn_123 + */ + virtual void __unk_vfn_123(); + /** + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 + */ + virtual void __unk_vfn_127(); + /** + * @vftbl 130 + * @symbol __unk_vfn_130 + */ + virtual void __unk_vfn_130(); + /** + * @vftbl 155 + * @symbol __unk_vfn_155 + */ + virtual void __unk_vfn_155(); + /** + * @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 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0TorchflowerBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + */ + MCAPI TorchflowerBlock(std::string const &, int); + +}; diff --git a/LiteLoader/include/llapi/mc/TorchflowerCropBlock.hpp b/LiteLoader/include/llapi/mc/TorchflowerCropBlock.hpp index 54e8840c11..a5c5b50ab6 100644 --- a/LiteLoader/include/llapi/mc/TorchflowerCropBlock.hpp +++ b/LiteLoader/include/llapi/mc/TorchflowerCropBlock.hpp @@ -40,16 +40,21 @@ class TorchflowerCropBlock : public CropBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class TorchflowerCropBlock : public CropBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class TorchflowerCropBlock : public CropBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,115 +131,115 @@ class TorchflowerCropBlock : public CropBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 + */ + virtual void __unk_vfn_74(); + /** + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_81(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 85 + * @symbol ?onFertilized\@TorchflowerCropBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ - virtual void __unk_vfn_75(); + virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@TorchflowerCropBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @vftbl 195 - * @symbol __unk_vfn_195 + * @symbol ?setGrowth\@TorchflowerCropBlock\@\@UEBAAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBV2\@GH\@Z */ - virtual void __unk_vfn_195(); + virtual class Block const & setGrowth(class BlockSource &, class BlockPos const &, class Block const &, unsigned short, int) const; /** * @vftbl 196 * @symbol ?getBaseSeed\@TorchflowerCropBlock\@\@UEBA?BVItemInstance\@\@XZ @@ -250,35 +255,6 @@ class TorchflowerCropBlock : public CropBlock { * @symbol ?getSeedNum\@TorchflowerCropBlock\@\@UEBAHAEAVRandomize\@\@HH\@Z */ virtual int getSeedNum(class Randomize &, int, int) const; - /** - * @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(); - /** - * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string const & getDescriptionId() const; /** * @symbol ??0TorchflowerCropBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/TrailRuinsPiece.hpp b/LiteLoader/include/llapi/mc/TrailRuinsPiece.hpp index 78cf555165..99f27366ec 100644 --- a/LiteLoader/include/llapi/mc/TrailRuinsPiece.hpp +++ b/LiteLoader/include/llapi/mc/TrailRuinsPiece.hpp @@ -55,4 +55,12 @@ class TrailRuinsPiece : public PoolElementStructurePiece { */ MCAPI static void addPieces(class BlockPos, std::vector> &, class Random &, class JigsawStructureRegistry &, enum class VanillaBiomeTypes, class Dimension &); +//private: + /** + * @symbol ?_isPieceTowerTop\@TrailRuinsPiece\@\@AEBA?B_NXZ + */ + MCAPI bool const _isPieceTowerTop() const; + +private: + }; diff --git a/LiteLoader/include/llapi/mc/TransferPacket.hpp b/LiteLoader/include/llapi/mc/TransferPacket.hpp index e68a6a4112..34b1d87be7 100644 --- a/LiteLoader/include/llapi/mc/TransferPacket.hpp +++ b/LiteLoader/include/llapi/mc/TransferPacket.hpp @@ -52,9 +52,9 @@ class TransferPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@TransferPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@TransferPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 b62d82ac48..72d8527884 100644 --- a/LiteLoader/include/llapi/mc/TrapDoorBlock.hpp +++ b/LiteLoader/include/llapi/mc/TrapDoorBlock.hpp @@ -55,16 +55,21 @@ class TrapDoorBlock : public BlockLegacy { * @symbol ?canConnect\@TrapDoorBlock\@\@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 __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -76,10 +81,10 @@ class TrapDoorBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -111,10 +116,10 @@ class TrapDoorBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -141,150 +146,145 @@ class TrapDoorBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 69 + * @vftbl 68 * @symbol ?checkIsPathable\@TrapDoorBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 73 + * @vftbl 72 * @symbol ?onRedstoneUpdate\@TrapDoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@TrapDoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 96 + * @vftbl 95 * @symbol ?breaksFallingBlocks\@TrapDoorBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@TrapDoorBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@TrapDoorBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@TrapDoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@TrapDoorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TRAPDOORBLOCK /** * @symbol ?canBeSilkTouched\@TrapDoorBlock\@\@MEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/TridentItem.hpp b/LiteLoader/include/llapi/mc/TridentItem.hpp index 6e99208765..4f5b1654ed 100644 --- a/LiteLoader/include/llapi/mc/TridentItem.hpp +++ b/LiteLoader/include/llapi/mc/TridentItem.hpp @@ -36,11 +36,6 @@ class TridentItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class TridentItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 23 * @symbol ?isThrowable\@TridentItem\@\@UEBA_NXZ @@ -156,6 +156,16 @@ class TridentItem : public Item { * @symbol ?hurtActor\@TridentItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z */ virtual void hurtActor(class ItemStack &, class Actor &, class Mob &) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); /** * @symbol ?CHARGE_THRESHOLD_TIME\@TridentItem\@\@2HB */ diff --git a/LiteLoader/include/llapi/mc/TrimDataPacket.hpp b/LiteLoader/include/llapi/mc/TrimDataPacket.hpp index 391a553b80..851d4e0328 100644 --- a/LiteLoader/include/llapi/mc/TrimDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/TrimDataPacket.hpp @@ -46,9 +46,9 @@ class TrimDataPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@TrimDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@TrimDataPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TRIMDATAPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/TripWireBlock.hpp b/LiteLoader/include/llapi/mc/TripWireBlock.hpp index 07dd0bbff3..356fe470a7 100644 --- a/LiteLoader/include/llapi/mc/TripWireBlock.hpp +++ b/LiteLoader/include/llapi/mc/TripWireBlock.hpp @@ -45,16 +45,21 @@ class TripWireBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class TripWireBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class TripWireBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,152 +136,147 @@ class TripWireBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 101 + * @vftbl 100 * @symbol ?playerWillDestroy\@TripWireBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@TripWireBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 112 + * @vftbl 111 * @symbol ?shouldTriggerEntityInside\@TripWireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual bool shouldTriggerEntityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 113 + * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@TripWireBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@TripWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@TripWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@TripWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@TripWireBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@TripWireBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/TripWireHookBlock.hpp b/LiteLoader/include/llapi/mc/TripWireHookBlock.hpp index e923ebabb7..c941bf6636 100644 --- a/LiteLoader/include/llapi/mc/TripWireHookBlock.hpp +++ b/LiteLoader/include/llapi/mc/TripWireHookBlock.hpp @@ -45,16 +45,21 @@ class TripWireHookBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class TripWireHookBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class TripWireHookBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,165 +136,160 @@ class TripWireHookBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 64 + * @vftbl 63 * @symbol ?shouldConnectToRedstone\@TripWireHookBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@TripWireHookBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 91 + * @vftbl 90 * @symbol ?mayPlace\@TripWireHookBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@TripWireHookBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@TripWireHookBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 144 + * @vftbl 142 * @symbol ?getVisualShape\@TripWireHookBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 148 + * @vftbl 146 * @symbol ?canSpawnOn\@TripWireHookBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@TripWireHookBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@TripWireHookBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@TripWireHookBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@TripWireHookBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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/TripodCamera.hpp b/LiteLoader/include/llapi/mc/TripodCamera.hpp index e540b76c49..7cc143add6 100644 --- a/LiteLoader/include/llapi/mc/TripodCamera.hpp +++ b/LiteLoader/include/llapi/mc/TripodCamera.hpp @@ -47,155 +47,150 @@ class TripodCamera : public Mob { */ virtual void remove(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 79 + * @vftbl 77 * @symbol ?getShadowHeightOffs\@TripodCamera\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 80 + * @vftbl 78 * @symbol ?getShadowRadius\@TripodCamera\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_80(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_86(); /** - * @vftbl 95 + * @vftbl 93 * @symbol ?isPickable\@TripodCamera\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_94(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_97(); + /** + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 258 + * @vftbl 250 * @symbol ?updateEntitySpecificMolangVariables\@TripodCamera\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@TripodCamera\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 338 + * @vftbl 330 * @symbol ?canExistWhenDisallowMob\@TripodCamera\@\@UEBA_NXZ */ virtual bool canExistWhenDisallowMob() const; /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); #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 f053ec40cd..04ac982c3b 100644 --- a/LiteLoader/include/llapi/mc/TropicalFish.hpp +++ b/LiteLoader/include/llapi/mc/TropicalFish.hpp @@ -42,145 +42,140 @@ class TropicalFish : public WaterAnimal { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 53 + * @vftbl 52 * @symbol ?startRiding\@TropicalFish\@\@UEAA_NAEAVActor\@\@\@Z */ virtual bool startRiding(class Actor &); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 - */ - virtual void __unk_vfn_178(); - /** - * @vftbl 187 + * @vftbl 185 * @symbol ?onSynchedDataUpdate\@TropicalFish\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 258 + * @vftbl 250 * @symbol ?updateEntitySpecificMolangVariables\@TropicalFish\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); + /** + * @vftbl 252 + * @symbol __unk_vfn_252 + */ + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); - /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 331 + * @vftbl 323 * @symbol ?createAIGoals\@TropicalFish\@\@UEAA_NXZ */ virtual bool createAIGoals(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0TropicalFish\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/TrustedKeys.hpp b/LiteLoader/include/llapi/mc/TrustedKeys.hpp index 366278ca5c..fc6e58d14f 100644 --- a/LiteLoader/include/llapi/mc/TrustedKeys.hpp +++ b/LiteLoader/include/llapi/mc/TrustedKeys.hpp @@ -22,8 +22,8 @@ namespace TrustedKeys { #undef AFTER_EXTRA /** - * @symbol ?AuthServicePublicKey\@TrustedKeys\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?getAuthServicePublicKeys\@TrustedKeys\@\@YAAEBV?$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 extern std::string const AuthServicePublicKey; + MCAPI std::vector const & getAuthServicePublicKeys(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/Turtle.hpp b/LiteLoader/include/llapi/mc/Turtle.hpp index 6e4a0b1c9f..a256f4a00d 100644 --- a/LiteLoader/include/llapi/mc/Turtle.hpp +++ b/LiteLoader/include/llapi/mc/Turtle.hpp @@ -37,140 +37,135 @@ class Turtle : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 80 + * @vftbl 78 * @symbol ?getShadowRadius\@Turtle\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 245 + * @vftbl 237 * @symbol ?die\@Turtle\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); + /** + * @vftbl 252 + * @symbol __unk_vfn_252 + */ + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); - /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 337 + * @vftbl 329 * @symbol ?_getWalkTargetValue\@Turtle\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0Turtle\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/TurtleEggBlock.hpp b/LiteLoader/include/llapi/mc/TurtleEggBlock.hpp index 021055feee..3505642e08 100644 --- a/LiteLoader/include/llapi/mc/TurtleEggBlock.hpp +++ b/LiteLoader/include/llapi/mc/TurtleEggBlock.hpp @@ -40,16 +40,26 @@ class TurtleEggBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); + /** + * @vftbl 22 + * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +71,10 @@ class TurtleEggBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +106,10 @@ class TurtleEggBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,15 +136,15 @@ class TurtleEggBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -142,151 +152,146 @@ class TurtleEggBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@TurtleEggBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 69 + * @vftbl 68 * @symbol ?checkIsPathable\@TurtleEggBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 72 + * @vftbl 71 * @symbol ?transformOnFall\@TurtleEggBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@M\@Z */ virtual void transformOnFall(class BlockSource &, class BlockPos const &, class Actor *, float) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 91 + * @vftbl 90 * @symbol ?mayPlace\@TurtleEggBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 101 + * @vftbl 100 * @symbol ?playerWillDestroy\@TurtleEggBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 113 + * @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 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@TurtleEggBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@TurtleEggBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@TurtleEggBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@TurtleEggBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@TurtleEggBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@TurtleEggBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/TwistingVinesBlock.hpp b/LiteLoader/include/llapi/mc/TwistingVinesBlock.hpp index 43869e2c0d..bebb5fea9e 100644 --- a/LiteLoader/include/llapi/mc/TwistingVinesBlock.hpp +++ b/LiteLoader/include/llapi/mc/TwistingVinesBlock.hpp @@ -45,16 +45,21 @@ class TwistingVinesBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class TwistingVinesBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class TwistingVinesBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,15 +136,15 @@ class TwistingVinesBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -147,136 +152,131 @@ class TwistingVinesBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@TwistingVinesBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@TwistingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@TwistingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@TwistingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@TwistingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@TwistingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@TwistingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@TwistingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@TwistingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @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 a1b552c0a5..c4086d5df1 100644 --- a/LiteLoader/include/llapi/mc/Types.hpp +++ b/LiteLoader/include/llapi/mc/Types.hpp @@ -83,7 +83,12 @@ class NetherNet { // static_assert(std::is_pod_v); -// namespace Core { + +namespace BlockTrait { +class IGetPlacementBlockCallback; +class ITrait; +}; + // namespace Core { // // class PathPart { // public: @@ -164,6 +169,7 @@ struct ISurfaceBuilder { struct BuildParameters; }; + struct FeatureLoading { template struct ConcreteFeatureHolder; @@ -315,6 +321,15 @@ class buffer_span; template class buffer_span_mut; +template +class ViewT; + +template +class Optional; + +template +class Include; + template class optional_ref { T* value; diff --git a/LiteLoader/include/llapi/mc/UnburiedConstraint.hpp b/LiteLoader/include/llapi/mc/UnburiedConstraint.hpp index 264a14c7f6..4b17b7953a 100644 --- a/LiteLoader/include/llapi/mc/UnburiedConstraint.hpp +++ b/LiteLoader/include/llapi/mc/UnburiedConstraint.hpp @@ -39,61 +39,6 @@ class UnburiedConstraint { * @symbol ?isSatisfied\@UnburiedConstraint\@\@UEBA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@\@Z */ virtual bool isSatisfied(class IBlockWorldGenAPI const &, class BlockPos const &, enum class Rotation const &) 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 __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 ?_Get\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEBAPEBXXZ - */ - virtual void const * _Get() const; - /** - * @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 ?_Delete_this\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEAAX_N\@Z - */ - virtual void _Delete_this(bool); /** * @symbol ??0UnburiedConstraint\@\@QEAA\@AEAVStructureTemplate\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/UnderwaterTorchBlock.hpp b/LiteLoader/include/llapi/mc/UnderwaterTorchBlock.hpp index 41057655dd..b42c2047b3 100644 --- a/LiteLoader/include/llapi/mc/UnderwaterTorchBlock.hpp +++ b/LiteLoader/include/llapi/mc/UnderwaterTorchBlock.hpp @@ -40,16 +40,21 @@ class UnderwaterTorchBlock : public TorchBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -62,14 +67,14 @@ class UnderwaterTorchBlock : public TorchBlock { virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol __unk_vfn_34 + * @symbol ?isWaterBlocking\@UnderwaterTorchBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_34(); + virtual bool isWaterBlocking() const; /** * @vftbl 35 - * @symbol ?isWaterBlocking\@UnderwaterTorchBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_35 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class UnderwaterTorchBlock : public TorchBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,15 +136,15 @@ class UnderwaterTorchBlock : public TorchBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -147,109 +152,104 @@ class UnderwaterTorchBlock : public TorchBlock { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@UnderwaterTorchBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 66 + * @vftbl 65 * @symbol ?canBeUsedInCommands\@UnderwaterTorchBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@UnderwaterTorchBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@UnderwaterTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 022fe41d3e..77bd6051f7 100644 --- a/LiteLoader/include/llapi/mc/UndyedShulkerBoxBlock.hpp +++ b/LiteLoader/include/llapi/mc/UndyedShulkerBoxBlock.hpp @@ -50,16 +50,21 @@ class UndyedShulkerBoxBlock : public ChestBlock { * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -71,10 +76,10 @@ class UndyedShulkerBoxBlock : public ChestBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +111,10 @@ class UndyedShulkerBoxBlock : public ChestBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,147 +141,142 @@ class UndyedShulkerBoxBlock : public ChestBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 71 + * @vftbl 70 * @symbol ?dispense\@UndyedShulkerBoxBlock\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 79 + * @vftbl 78 * @symbol ?setupRedstoneComponent\@UndyedShulkerBoxBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 96 + * @vftbl 95 * @symbol ?breaksFallingBlocks\@UndyedShulkerBoxBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 101 + * @vftbl 100 * @symbol ?playerWillDestroy\@UndyedShulkerBoxBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 102 + * @vftbl 101 * @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 103 + * @vftbl 102 * @symbol ?asItemInstance\@UndyedShulkerBoxBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 136 + * @vftbl 134 * @symbol ?getColor\@UndyedShulkerBoxBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @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 04207aef0d..ffc671de0d 100644 --- a/LiteLoader/include/llapi/mc/UnknownBlock.hpp +++ b/LiteLoader/include/llapi/mc/UnknownBlock.hpp @@ -40,16 +40,21 @@ class UnknownBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class UnknownBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class UnknownBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,105 +131,100 @@ class UnknownBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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/UnlockedRecipesPacket.hpp b/LiteLoader/include/llapi/mc/UnlockedRecipesPacket.hpp index 5f0026f034..67cb6e7a15 100644 --- a/LiteLoader/include/llapi/mc/UnlockedRecipesPacket.hpp +++ b/LiteLoader/include/llapi/mc/UnlockedRecipesPacket.hpp @@ -46,22 +46,22 @@ class UnlockedRecipesPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@UnlockedRecipesPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@UnlockedRecipesPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_UNLOCKEDRECIPESPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~UnlockedRecipesPacket(); #endif - /** - * @symbol ??0UnlockedRecipesPacket\@\@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\@\@_N\@Z - */ - MCAPI UnlockedRecipesPacket(std::vector const &, bool); /** * @symbol ??0UnlockedRecipesPacket\@\@QEAA\@XZ */ MCAPI UnlockedRecipesPacket(); + /** + * @symbol ??0UnlockedRecipesPacket\@\@QEAA\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@W4PacketType\@0\@\@Z + */ + MCAPI UnlockedRecipesPacket(std::vector, enum class UnlockedRecipesPacket::PacketType); }; diff --git a/LiteLoader/include/llapi/mc/UnlockedRecipesServerComponent.hpp b/LiteLoader/include/llapi/mc/UnlockedRecipesServerComponent.hpp index 704f999ac0..34c420d795 100644 --- a/LiteLoader/include/llapi/mc/UnlockedRecipesServerComponent.hpp +++ b/LiteLoader/include/llapi/mc/UnlockedRecipesServerComponent.hpp @@ -37,9 +37,53 @@ class UnlockedRecipesServerComponent { */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?markInventoryAsChanged\@UnlockedRecipesServerComponent\@\@QEAAXXZ + * @symbol ?addUnlockedRecipe\@UnlockedRecipesServerComponent\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI void markInventoryAsChanged(); + MCAPI void addUnlockedRecipe(std::string const &); + /** + * @symbol ?clearUnlockingInstructions\@UnlockedRecipesServerComponent\@\@QEAAXXZ + */ + MCAPI void clearUnlockingInstructions(); + /** + * @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 + */ + MCAPI class std::unordered_set, struct std::equal_to, class std::allocator> const & getUnlockedRecipes() const; + /** + * @symbol ?getUnlockingInstructions\@UnlockedRecipesServerComponent\@\@QEBAAEBV?$vector\@UUnlockingInstruction\@UnlockedRecipesServerComponent\@\@V?$allocator\@UUnlockingInstruction\@UnlockedRecipesServerComponent\@\@\@std\@\@\@std\@\@XZ + */ + MCAPI std::vector const & getUnlockingInstructions() const; + /** + * @symbol ?hasContextBeenUsed\@UnlockedRecipesServerComponent\@\@QEBA_NW4UnlockingContext\@RecipeUnlockingRequirement\@\@\@Z + */ + MCAPI bool hasContextBeenUsed(enum class RecipeUnlockingRequirement::UnlockingContext) const; + /** + * @symbol ?hasInitialDataBeenSent\@UnlockedRecipesServerComponent\@\@QEBA_NXZ + */ + MCAPI bool hasInitialDataBeenSent() const; + /** + * @symbol ?hasInventoryChanged\@UnlockedRecipesServerComponent\@\@QEBA_NXZ + */ + MCAPI bool hasInventoryChanged() const; + /** + * @symbol ?hasUnlockedRecipes\@UnlockedRecipesServerComponent\@\@QEBA_NXZ + */ + MCAPI bool hasUnlockedRecipes() const; + /** + * @symbol ?hasUnlockingInstructions\@UnlockedRecipesServerComponent\@\@QEBA_NXZ + */ + MCAPI bool hasUnlockingInstructions() const; + /** + * @symbol ?isRecipeUnlocked\@UnlockedRecipesServerComponent\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI bool isRecipeUnlocked(std::string const &) const; + /** + * @symbol ?markContextAsUsed\@UnlockedRecipesServerComponent\@\@QEAAXW4UnlockingContext\@RecipeUnlockingRequirement\@\@\@Z + */ + MCAPI void markContextAsUsed(enum class RecipeUnlockingRequirement::UnlockingContext); + /** + * @symbol ?markInitialDataAsSent\@UnlockedRecipesServerComponent\@\@QEAAXXZ + */ + MCAPI void markInitialDataAsSent(); /** * @symbol ??4UnlockedRecipesServerComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ @@ -49,36 +93,32 @@ class UnlockedRecipesServerComponent { */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?updateRecipeUnlocking\@UnlockedRecipesServerComponent\@\@QEAAXPEAVServerPlayer\@\@\@Z + * @symbol ?removeAllUnlockedRecipes\@UnlockedRecipesServerComponent\@\@QEAAXXZ */ - MCAPI void updateRecipeUnlocking(class ServerPlayer *); + MCAPI void removeAllUnlockedRecipes(); /** - * @symbol ?COMPONENT_TAG\@UnlockedRecipesServerComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?removeUnlockedRecipe\@UnlockedRecipesServerComponent\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI static std::string const COMPONENT_TAG; + MCAPI void removeUnlockedRecipe(std::string const &); /** - * @symbol ?UNLOCKED_RECIPES_TAG\@UnlockedRecipesServerComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?resetUsedContexts\@UnlockedRecipesServerComponent\@\@QEAAXXZ */ - MCAPI static std::string const UNLOCKED_RECIPES_TAG; + MCAPI void resetUsedContexts(); /** - * @symbol ?USED_CONTEXTS_TAG\@UnlockedRecipesServerComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?setInventoryChangedStatus\@UnlockedRecipesServerComponent\@\@QEAAX_N\@Z */ - MCAPI static std::string const USED_CONTEXTS_TAG; - -//protected: + MCAPI void setInventoryChangedStatus(bool); /** - * @symbol ?isRecipeUnlocked\@UnlockedRecipesServerComponent\@\@IEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?COMPONENT_TAG\@UnlockedRecipesServerComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ - MCAPI bool isRecipeUnlocked(std::string const &) const; + MCAPI static std::string const COMPONENT_TAG; /** - * @symbol ?unlockRecipes\@UnlockedRecipesServerComponent\@\@IEAA?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\@\@AEBVRecipes\@\@_NAEBV?$optional\@UInventoryChangedData\@UnlockedRecipesServerComponent\@\@\@3\@\@Z + * @symbol ?UNLOCKED_RECIPES_TAG\@UnlockedRecipesServerComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ - MCAPI std::vector unlockRecipes(class Recipes const &, bool, class std::optional const &); + MCAPI static std::string const UNLOCKED_RECIPES_TAG; /** - * @symbol ?useContext\@UnlockedRecipesServerComponent\@\@IEAAXAEBVRecipes\@\@W4UnlockingContext\@RecipeUnlockingRequirement\@\@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\@\@\@Z + * @symbol ?USED_CONTEXTS_TAG\@UnlockedRecipesServerComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ - MCAPI void useContext(class Recipes const &, enum class RecipeUnlockingRequirement::UnlockingContext, std::vector &); - -protected: + MCAPI static std::string const USED_CONTEXTS_TAG; }; diff --git a/LiteLoader/include/llapi/mc/UpdateAISystem.hpp b/LiteLoader/include/llapi/mc/UpdateAISystem.hpp index 2616cd5832..274086a306 100644 --- a/LiteLoader/include/llapi/mc/UpdateAISystem.hpp +++ b/LiteLoader/include/llapi/mc/UpdateAISystem.hpp @@ -29,4 +29,12 @@ 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 f9c95dbc2a..7729d1ea93 100644 --- a/LiteLoader/include/llapi/mc/UpdateAbilitiesPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateAbilitiesPacket.hpp @@ -49,9 +49,9 @@ class UpdateAbilitiesPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@UpdateAbilitiesPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@UpdateAbilitiesPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 1734ba88a8..c39183c9c0 100644 --- a/LiteLoader/include/llapi/mc/UpdateAdventureSettingsPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateAdventureSettingsPacket.hpp @@ -49,9 +49,9 @@ class UpdateAdventureSettingsPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@UpdateAdventureSettingsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@UpdateAdventureSettingsPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 6972636bb8..a4455ccb5f 100644 --- a/LiteLoader/include/llapi/mc/UpdateAttributesPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateAttributesPacket.hpp @@ -51,9 +51,9 @@ class UpdateAttributesPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@UpdateAttributesPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@UpdateAttributesPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 1157683d8b..51e58b18ef 100644 --- a/LiteLoader/include/llapi/mc/UpdateBlockPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateBlockPacket.hpp @@ -51,22 +51,22 @@ class UpdateBlockPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@UpdateBlockPacket\@\@MEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@UpdateBlockPacket\@\@MEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPDATEBLOCKPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~UpdateBlockPacket(); #endif - /** - * @symbol ??0UpdateBlockPacket\@\@QEAA\@XZ - */ - MCAPI UpdateBlockPacket(); /** * @symbol ??0UpdateBlockPacket\@\@QEAA\@AEBVBlockPos\@\@IIE\@Z */ MCAPI UpdateBlockPacket(class BlockPos const &, unsigned int, unsigned int, unsigned char); + /** + * @symbol ??0UpdateBlockPacket\@\@QEAA\@XZ + */ + MCAPI UpdateBlockPacket(); }; diff --git a/LiteLoader/include/llapi/mc/UpdateBlockSyncedPacket.hpp b/LiteLoader/include/llapi/mc/UpdateBlockSyncedPacket.hpp index cdafc4df44..e48f0461a2 100644 --- a/LiteLoader/include/llapi/mc/UpdateBlockSyncedPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateBlockSyncedPacket.hpp @@ -51,9 +51,9 @@ class UpdateBlockSyncedPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@UpdateBlockSyncedPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@UpdateBlockSyncedPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 e01dcdf28a..bd1dc12ab9 100644 --- a/LiteLoader/include/llapi/mc/UpdateClientInputLocksPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateClientInputLocksPacket.hpp @@ -49,9 +49,9 @@ class UpdateClientInputLocksPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@UpdateClientInputLocksPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@UpdateClientInputLocksPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPDATECLIENTINPUTLOCKSPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/UpdateEquipPacket.hpp b/LiteLoader/include/llapi/mc/UpdateEquipPacket.hpp index e791fee6f9..497f0c082a 100644 --- a/LiteLoader/include/llapi/mc/UpdateEquipPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateEquipPacket.hpp @@ -51,9 +51,9 @@ class UpdateEquipPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@UpdateEquipPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@UpdateEquipPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 99f44416b0..082a64d6a4 100644 --- a/LiteLoader/include/llapi/mc/UpdatePlayerGameTypePacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdatePlayerGameTypePacket.hpp @@ -51,22 +51,22 @@ class UpdatePlayerGameTypePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@UpdatePlayerGameTypePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@UpdatePlayerGameTypePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPDATEPLAYERGAMETYPEPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~UpdatePlayerGameTypePacket(); #endif - /** - * @symbol ??0UpdatePlayerGameTypePacket\@\@QEAA\@XZ - */ - MCAPI UpdatePlayerGameTypePacket(); /** * @symbol ??0UpdatePlayerGameTypePacket\@\@QEAA\@W4GameType\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI UpdatePlayerGameTypePacket(enum class GameType, struct ActorUniqueID const &); + /** + * @symbol ??0UpdatePlayerGameTypePacket\@\@QEAA\@XZ + */ + MCAPI UpdatePlayerGameTypePacket(); }; diff --git a/LiteLoader/include/llapi/mc/UpdateServerPlayerInputSystem.hpp b/LiteLoader/include/llapi/mc/UpdateServerPlayerInputSystem.hpp new file mode 100644 index 0000000000..db73180bc0 --- /dev/null +++ b/LiteLoader/include/llapi/mc/UpdateServerPlayerInputSystem.hpp @@ -0,0 +1,36 @@ +/** + * @file UpdateServerPlayerInputSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class UpdateServerPlayerInputSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_UPDATESERVERPLAYERINPUTSYSTEM +public: + class UpdateServerPlayerInputSystem& operator=(class UpdateServerPlayerInputSystem const &) = delete; + UpdateServerPlayerInputSystem(class UpdateServerPlayerInputSystem const &) = delete; + UpdateServerPlayerInputSystem() = delete; +#endif + +public: + /** + * @symbol ?createPlayerInputUpdateSystem\@UpdateServerPlayerInputSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createPlayerInputUpdateSystem(); + /** + * @symbol ?createSneakUpdateSystem\@UpdateServerPlayerInputSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createSneakUpdateSystem(); + +}; diff --git a/LiteLoader/include/llapi/mc/UpdateServerPlayerInputSystemImpl.hpp b/LiteLoader/include/llapi/mc/UpdateServerPlayerInputSystemImpl.hpp new file mode 100644 index 0000000000..8870d0a6f0 --- /dev/null +++ b/LiteLoader/include/llapi/mc/UpdateServerPlayerInputSystemImpl.hpp @@ -0,0 +1,28 @@ +/** + * @file UpdateServerPlayerInputSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace UpdateServerPlayerInputSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?_handlePlayerAuthInputPacket\@UpdateServerPlayerInputSystemImpl\@\@YAXAEBUStateVectorComponent\@\@AEAUActorHeadRotationComponent\@\@AEAUActorRotationComponent\@\@AEAUPlayerInputModeComponent\@\@AEAUPlayerInteractionModelComponent\@\@AEAUServerPlayerCurrentMovementComponent\@\@\@Z + */ + MCAPI void _handlePlayerAuthInputPacket(struct StateVectorComponent const &, struct ActorHeadRotationComponent &, struct ActorRotationComponent &, struct PlayerInputModeComponent &, struct PlayerInteractionModelComponent &, struct ServerPlayerCurrentMovementComponent &); + /** + * @symbol ?_updateServerPlayerSneaking\@UpdateServerPlayerInputSystemImpl\@\@YAXAEBUSynchedActorDataComponent\@\@AEAUServerPlayerCurrentMovementComponent\@\@\@Z + */ + MCAPI void _updateServerPlayerSneaking(struct SynchedActorDataComponent const &, struct ServerPlayerCurrentMovementComponent &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/UpdateSoftEnumPacket.hpp b/LiteLoader/include/llapi/mc/UpdateSoftEnumPacket.hpp index b8aaa124bb..4273b9ed5f 100644 --- a/LiteLoader/include/llapi/mc/UpdateSoftEnumPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateSoftEnumPacket.hpp @@ -57,9 +57,9 @@ class UpdateSoftEnumPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@UpdateSoftEnumPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@UpdateSoftEnumPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _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 4788a36bdb..59642f9e60 100644 --- a/LiteLoader/include/llapi/mc/UpdateSubChunkBlocksPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateSubChunkBlocksPacket.hpp @@ -51,23 +51,23 @@ class UpdateSubChunkBlocksPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@UpdateSubChunkBlocksPacket\@\@MEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@UpdateSubChunkBlocksPacket\@\@MEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPDATESUBCHUNKBLOCKSPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~UpdateSubChunkBlocksPacket(); #endif - /** - * @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 ??0UpdateSubChunkBlocksPacket\@\@QEAA\@XZ + */ + MCAPI UpdateSubChunkBlocksPacket(); /** * @symbol ?setSubChunkPosition\@UpdateSubChunkBlocksPacket\@\@QEAAXAEBVSubChunkPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/UpdateTradePacket.hpp b/LiteLoader/include/llapi/mc/UpdateTradePacket.hpp index 12234a2cd4..5f24ccc545 100644 --- a/LiteLoader/include/llapi/mc/UpdateTradePacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateTradePacket.hpp @@ -51,9 +51,9 @@ class UpdateTradePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@UpdateTradePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@UpdateTradePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPDATETRADEPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/Util.hpp b/LiteLoader/include/llapi/mc/Util.hpp index 35a543d9ff..a443413480 100644 --- a/LiteLoader/include/llapi/mc/Util.hpp +++ b/LiteLoader/include/llapi/mc/Util.hpp @@ -99,9 +99,9 @@ struct FormattedString { */ MCAPI std::string base64url_encode(std::string); /** - * @symbol ?boolToString\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?boolToString\@Util\@\@YAPEBD_N\@Z */ - MCAPI std::string boolToString(bool); + MCAPI char const * boolToString(bool); /** * @symbol ?clearAndReturn\@Util\@\@YAAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV23\@\@Z */ @@ -318,10 +318,6 @@ struct FormattedString { * @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\@\@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\@\@AEBV?$basic_string\@_WU?$char_traits\@_W\@std\@\@V?$allocator\@_W\@2\@\@3\@\@Z */ @@ -330,6 +326,10 @@ struct FormattedString { * @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 ?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 ?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/VRBobControlSystem.hpp b/LiteLoader/include/llapi/mc/VRBobControlSystem.hpp index 9ab1b587d0..a9760296fa 100644 --- a/LiteLoader/include/llapi/mc/VRBobControlSystem.hpp +++ b/LiteLoader/include/llapi/mc/VRBobControlSystem.hpp @@ -28,9 +28,5 @@ class VRBobControlSystem { * @symbol ?create\@VRBobControlSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); - /** - * @symbol ?createSideBySide\@VRBobControlSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSideBySide(); }; diff --git a/LiteLoader/include/llapi/mc/VRBobControlSystemInternal.hpp b/LiteLoader/include/llapi/mc/VRBobControlSystemInternal.hpp index 27c996a9d1..2d30e2c7f6 100644 --- a/LiteLoader/include/llapi/mc/VRBobControlSystemInternal.hpp +++ b/LiteLoader/include/llapi/mc/VRBobControlSystemInternal.hpp @@ -17,8 +17,8 @@ namespace VRBobControlSystemInternal { #undef AFTER_EXTRA /** - * @symbol ?tickVRBobControl\@VRBobControlSystemInternal\@\@YAXAEBVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEBUAbilitiesComponent\@\@AEAUStateVectorComponent\@\@AEBVIConstBlockSource\@\@\@Z + * @symbol ?tickVRBobControl\@VRBobControlSystemInternal\@\@YAXAEBVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEBUAbilitiesComponent\@\@AEBUPlayerInputModeComponent\@\@AEAUStateVectorComponent\@\@AEBVIConstBlockSource\@\@\@Z */ - MCAPI void tickVRBobControl(class StrictEntityContext const &, struct AABBShapeComponent const &, struct AbilitiesComponent const &, struct StateVectorComponent &, class IConstBlockSource const &); + MCAPI void tickVRBobControl(class StrictEntityContext const &, struct AABBShapeComponent const &, struct AbilitiesComponent const &, struct PlayerInputModeComponent const &, struct StateVectorComponent &, class IConstBlockSource const &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/VRFlyTravelSystem.hpp b/LiteLoader/include/llapi/mc/VRFlyTravelSystem.hpp index d82dc918d5..cadccc2a38 100644 --- a/LiteLoader/include/llapi/mc/VRFlyTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/VRFlyTravelSystem.hpp @@ -25,13 +25,21 @@ class VRFlyTravelSystem { public: /** - * @symbol ?_postPlayerTravelSystem\@VRFlyTravelSystem\@\@SAXAEBVStrictEntityContext\@\@AEAUAbilitiesComponent\@\@AEBULocalPlayerPrePlayerTravelComponent\@\@\@Z + * @symbol ?_postPlayerTravelSystem\@VRFlyTravelSystem\@\@SAXAEBULocalPlayerPrePlayerTravelComponent\@\@AEAUAbilitiesComponent\@\@\@Z */ - MCAPI static void _postPlayerTravelSystem(class StrictEntityContext const &, struct AbilitiesComponent &, struct LocalPlayerPrePlayerTravelComponent const &); + MCAPI static void _postPlayerTravelSystem(struct LocalPlayerPrePlayerTravelComponent const &, struct AbilitiesComponent &); /** - * @symbol ?_prePlayerTravelSystem\@VRFlyTravelSystem\@\@SAXAEBVStrictEntityContext\@\@AEAUMobTravelComponent\@\@AEAUAbilitiesComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@ULocalPlayerPrePlayerTravelComponent\@\@\@\@\@Z + * @symbol ?_prePlayerTravelSystem\@VRFlyTravelSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUPlayerInputModeComponent\@\@AEAUMobTravelComponent\@\@AEAUAbilitiesComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@ULocalPlayerPrePlayerTravelComponent\@\@\@\@\@Z */ - MCAPI static void _prePlayerTravelSystem(class StrictEntityContext const &, struct MobTravelComponent &, struct AbilitiesComponent &, class EntityModifierT); + MCAPI static void _prePlayerTravelSystem(class StrictEntityContext const &, struct PlayerInputModeComponent const &, struct MobTravelComponent &, struct AbilitiesComponent &, class EntityModifierT); + /** + * @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 */ @@ -40,5 +48,9 @@ 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 new file mode 100644 index 0000000000..f760bdfe9f --- /dev/null +++ b/LiteLoader/include/llapi/mc/VRFlyTravelSystemInternal.hpp @@ -0,0 +1,28 @@ +/** + * @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/VRRotateControlSystem.hpp b/LiteLoader/include/llapi/mc/VRRotateControlSystem.hpp deleted file mode 100644 index 52a8e15e99..0000000000 --- a/LiteLoader/include/llapi/mc/VRRotateControlSystem.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file VRRotateControlSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class VRRotateControlSystem. - * - */ -class VRRotateControlSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_VRROTATECONTROLSYSTEM -public: - class VRRotateControlSystem& operator=(class VRRotateControlSystem const &) = delete; - VRRotateControlSystem(class VRRotateControlSystem const &) = delete; - VRRotateControlSystem() = delete; -#endif - -public: - /** - * @symbol ?create\@VRRotateControlSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo create(); - /** - * @symbol ?tick\@VRRotateControlSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPlayerInputRequestComponent\@\@\@\@$$CBUMoveInputComponent\@\@$$CBUPlayerInputModeComponent\@\@$$CBUVRMoveAdjustAngleComponent\@\@ULocalMoveVelocityComponent\@\@\@\@\@Z - */ - MCAPI static void tick(class ViewT, struct MoveInputComponent const, struct PlayerInputModeComponent const, struct VRMoveAdjustAngleComponent const, struct LocalMoveVelocityComponent>); - -}; diff --git a/LiteLoader/include/llapi/mc/VanillaBlockTags.hpp b/LiteLoader/include/llapi/mc/VanillaBlockTags.hpp index 1b659631ac..1676cb7f6c 100644 --- a/LiteLoader/include/llapi/mc/VanillaBlockTags.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBlockTags.hpp @@ -26,6 +26,10 @@ namespace VanillaBlockTags { * @symbol ?Birch\@VanillaBlockTags\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Birch; + /** + * @symbol ?Crop\@VanillaBlockTags\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const Crop; /** * @symbol ?DarkOak\@VanillaBlockTags\@\@3VHashedString\@\@B */ diff --git a/LiteLoader/include/llapi/mc/VanillaBlockTypeGroups.hpp b/LiteLoader/include/llapi/mc/VanillaBlockTypeGroups.hpp index e59fee1430..a53237595a 100644 --- a/LiteLoader/include/llapi/mc/VanillaBlockTypeGroups.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBlockTypeGroups.hpp @@ -16,6 +16,14 @@ namespace VanillaBlockTypeGroups { #define AFTER_EXTRA #undef AFTER_EXTRA + /** + * @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 ?CoralIds\@VanillaBlockTypeGroups\@\@3V?$vector\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@\@2\@\@std\@\@B + */ + MCAPI extern std::vector> const CoralIds; /** * @symbol ?LogBlockIds\@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 2c194ef029..bd3baab1e2 100644 --- a/LiteLoader/include/llapi/mc/VanillaBlockTypeIds.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBlockTypeIds.hpp @@ -279,6 +279,10 @@ namespace VanillaBlockTypeIds { * @symbol ?BlackCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BlackCandleCake; + /** + * @symbol ?BlackCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const BlackCarpet; /** * @symbol ?BlackGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -319,6 +323,10 @@ namespace VanillaBlockTypeIds { * @symbol ?BlueCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BlueCandleCake; + /** + * @symbol ?BlueCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const BlueCarpet; /** * @symbol ?BlueGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -343,6 +351,10 @@ namespace VanillaBlockTypeIds { * @symbol ?BorderBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BorderBlock; + /** + * @symbol ?BrainCoral\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const BrainCoral; /** * @symbol ?BrewingStand\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -363,6 +375,10 @@ namespace VanillaBlockTypeIds { * @symbol ?BrownCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BrownCandleCake; + /** + * @symbol ?BrownCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const BrownCarpet; /** * @symbol ?BrownGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -383,6 +399,10 @@ namespace VanillaBlockTypeIds { * @symbol ?BubbleColumn\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BubbleColumn; + /** + * @symbol ?BubbleCoral\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const BubbleCoral; /** * @symbol ?BuddingAmethyst\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -419,10 +439,6 @@ namespace VanillaBlockTypeIds { * @symbol ?CandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CandleCake; - /** - * @symbol ?Carpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const Carpet; /** * @symbol ?Carrots\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -651,10 +667,6 @@ namespace VanillaBlockTypeIds { * @symbol ?CopperOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CopperOre; - /** - * @symbol ?Coral\@VanillaBlockTypeIds\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const Coral; /** * @symbol ?CoralBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -795,6 +807,10 @@ namespace VanillaBlockTypeIds { * @symbol ?CyanCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CyanCandleCake; + /** + * @symbol ?CyanCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CyanCarpet; /** * @symbol ?CyanGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -859,6 +875,26 @@ namespace VanillaBlockTypeIds { * @symbol ?DaylightDetectorInverted\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DaylightDetectorInverted; + /** + * @symbol ?DeadBrainCoral\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const DeadBrainCoral; + /** + * @symbol ?DeadBubbleCoral\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const DeadBubbleCoral; + /** + * @symbol ?DeadFireCoral\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const DeadFireCoral; + /** + * @symbol ?DeadHornCoral\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const DeadHornCoral; + /** + * @symbol ?DeadTubeCoral\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const DeadTubeCoral; /** * @symbol ?Deadbush\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -1099,6 +1135,10 @@ namespace VanillaBlockTypeIds { * @symbol ?Fire\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Fire; + /** + * @symbol ?FireCoral\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const FireCoral; /** * @symbol ?FletchingTable\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -1195,6 +1235,10 @@ namespace VanillaBlockTypeIds { * @symbol ?GrayCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GrayCandleCake; + /** + * @symbol ?GrayCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const GrayCarpet; /** * @symbol ?GrayGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -1211,6 +1255,10 @@ namespace VanillaBlockTypeIds { * @symbol ?GreenCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GreenCandleCake; + /** + * @symbol ?GreenCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const GreenCarpet; /** * @symbol ?GreenGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -1267,6 +1315,10 @@ namespace VanillaBlockTypeIds { * @symbol ?Hopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Hopper; + /** + * @symbol ?HornCoral\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const HornCoral; /** * @symbol ?Ice\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -1391,10 +1443,6 @@ namespace VanillaBlockTypeIds { * @symbol ?Lava\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Lava; - /** - * @symbol ?LavaCauldron\@VanillaBlockTypeIds\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const LavaCauldron; /** * @symbol ?Leaves\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -1423,6 +1471,10 @@ namespace VanillaBlockTypeIds { * @symbol ?LightBlueCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LightBlueCandleCake; + /** + * @symbol ?LightBlueCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const LightBlueCarpet; /** * @symbol ?LightBlueGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -1439,6 +1491,10 @@ namespace VanillaBlockTypeIds { * @symbol ?LightGrayCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LightGrayCandleCake; + /** + * @symbol ?LightGrayCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const LightGrayCarpet; /** * @symbol ?LightGrayWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -1459,6 +1515,10 @@ namespace VanillaBlockTypeIds { * @symbol ?LimeCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LimeCandleCake; + /** + * @symbol ?LimeCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const LimeCarpet; /** * @symbol ?LimeGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -1511,6 +1571,10 @@ namespace VanillaBlockTypeIds { * @symbol ?MagentaCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MagentaCandleCake; + /** + * @symbol ?MagentaCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const MagentaCarpet; /** * @symbol ?MagentaGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -1763,6 +1827,10 @@ namespace VanillaBlockTypeIds { * @symbol ?OrangeCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const OrangeCandleCake; + /** + * @symbol ?OrangeCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const OrangeCarpet; /** * @symbol ?OrangeGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -1811,6 +1879,10 @@ namespace VanillaBlockTypeIds { * @symbol ?PinkCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PinkCandleCake; + /** + * @symbol ?PinkCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const PinkCarpet; /** * @symbol ?PinkGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -1831,6 +1903,14 @@ namespace VanillaBlockTypeIds { * @symbol ?PistonArmCollision\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PistonArmCollision; + /** + * @symbol ?PitcherCrop\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const PitcherCrop; + /** + * @symbol ?PitcherPlant\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const PitcherPlant; /** * @symbol ?Planks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -1975,6 +2055,10 @@ namespace VanillaBlockTypeIds { * @symbol ?PurpleCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PurpleCandleCake; + /** + * @symbol ?PurpleCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const PurpleCarpet; /** * @symbol ?PurpleGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -2031,6 +2115,10 @@ namespace VanillaBlockTypeIds { * @symbol ?RedCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RedCandleCake; + /** + * @symbol ?RedCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const RedCarpet; /** * @symbol ?RedFlower\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -2215,6 +2303,10 @@ namespace VanillaBlockTypeIds { * @symbol ?SmoothStone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SmoothStone; + /** + * @symbol ?SnifferEgg\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const SnifferEgg; /** * @symbol ?Snow\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -2499,6 +2591,10 @@ namespace VanillaBlockTypeIds { * @symbol ?TripWireHook\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const TripWireHook; + /** + * @symbol ?TubeCoral\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const TubeCoral; /** * @symbol ?Tuff\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -2751,6 +2847,10 @@ namespace VanillaBlockTypeIds { * @symbol ?WhiteCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WhiteCandleCake; + /** + * @symbol ?WhiteCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const WhiteCarpet; /** * @symbol ?WhiteGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -2791,6 +2891,10 @@ namespace VanillaBlockTypeIds { * @symbol ?YellowCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const YellowCandleCake; + /** + * @symbol ?YellowCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const YellowCarpet; /** * @symbol ?YellowFlower\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ diff --git a/LiteLoader/include/llapi/mc/VanillaBlockTypes.hpp b/LiteLoader/include/llapi/mc/VanillaBlockTypes.hpp index 02d213208a..77208faac9 100644 --- a/LiteLoader/include/llapi/mc/VanillaBlockTypes.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBlockTypes.hpp @@ -21,138 +21,18 @@ namespace VanillaBlockTypes { // Add Member There #undef AFTER_EXTRA - /** - * @symbol ?mAmethystBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mAmethystBlock; - /** - * @symbol ?mAmethystCluster\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mAmethystCluster; /** * @symbol ?mBambooSapling\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mBambooSapling; - /** - * @symbol ?mBlackstoneDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mBlackstoneDoubleSlab; - /** - * @symbol ?mBlackstoneSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mBlackstoneSlab; - /** - * @symbol ?mBuddingAmethyst\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mBuddingAmethyst; - /** - * @symbol ?mCalcite\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mCalcite; - /** - * @symbol ?mChest\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mChest; - /** - * @symbol ?mChiseledDeepslate\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mChiseledDeepslate; - /** - * @symbol ?mCobbledDeepslateDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mCobbledDeepslateDoubleSlab; - /** - * @symbol ?mCobbledDeepslateSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mCobbledDeepslateSlab; - /** - * @symbol ?mCrackedDeepslateTiles\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mCrackedDeepslateTiles; - /** - * @symbol ?mCrimsonDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mCrimsonDoubleSlab; - /** - * @symbol ?mCrimsonSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mCrimsonSlab; - /** - * @symbol ?mCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mCutCopperSlab; /** * @symbol ?mCutCopperStairs\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mCutCopperStairs; - /** - * @symbol ?mDeepslate\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mDeepslate; - /** - * @symbol ?mDeepslateBrickDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mDeepslateBrickDoubleSlab; - /** - * @symbol ?mDeepslateBrickSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mDeepslateBrickSlab; - /** - * @symbol ?mDeepslateTileDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mDeepslateTileDoubleSlab; - /** - * @symbol ?mDeepslateTileSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mDeepslateTileSlab; - /** - * @symbol ?mDeepslateTiles\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mDeepslateTiles; - /** - * @symbol ?mDoubleCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mDoubleCutCopperSlab; - /** - * @symbol ?mDoubleStoneSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mDoubleStoneSlab; - /** - * @symbol ?mDoubleStoneSlab2\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mDoubleStoneSlab2; - /** - * @symbol ?mDoubleStoneSlab3\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mDoubleStoneSlab3; - /** - * @symbol ?mDoubleStoneSlab4\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mDoubleStoneSlab4; - /** - * @symbol ?mDoubleWoodenSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mDoubleWoodenSlab; - /** - * @symbol ?mDripstone\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mDripstone; - /** - * @symbol ?mExposedCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mExposedCutCopperSlab; /** * @symbol ?mExposedCutCopperStairs\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mExposedCutCopperStairs; - /** - * @symbol ?mExposedDoubleCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mExposedDoubleCutCopperSlab; - /** - * @symbol ?mFrogSpawn\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mFrogSpawn; /** * @symbol ?mGildedBlackstone\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ @@ -165,14 +45,6 @@ namespace VanillaBlockTypes { * @symbol ?mGrassPathBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mGrassPathBlock; - /** - * @symbol ?mInfestedDeepslate\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mInfestedDeepslate; - /** - * @symbol ?mLargeAmethystBud\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mLargeAmethystBud; /** * @symbol ?mLodestoneBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ @@ -181,66 +53,14 @@ namespace VanillaBlockTypes { * @symbol ?mMagmaBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mMagmaBlock; - /** - * @symbol ?mMangroveDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mMangroveDoubleSlab; - /** - * @symbol ?mMangrovePropagule\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mMangrovePropagule; - /** - * @symbol ?mMangroveRoots\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mMangroveRoots; - /** - * @symbol ?mMangroveSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mMangroveSlab; /** * @symbol ?mMangroveWood\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mMangroveWood; - /** - * @symbol ?mMediumAmethystBud\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mMediumAmethystBud; - /** - * @symbol ?mMudBrickDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mMudBrickDoubleSlab; - /** - * @symbol ?mMudBrickSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mMudBrickSlab; - /** - * @symbol ?mMuddyMangroveRoots\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mMuddyMangroveRoots; - /** - * @symbol ?mOchreFroglight\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mOchreFroglight; - /** - * @symbol ?mOxidizedCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mOxidizedCutCopperSlab; /** * @symbol ?mOxidizedCutCopperStairs\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mOxidizedCutCopperStairs; - /** - * @symbol ?mOxidizedDoubleCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mOxidizedDoubleCutCopperSlab; - /** - * @symbol ?mPearlescentFroglight\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mPearlescentFroglight; - /** - * @symbol ?mPointedDripstone\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mPointedDripstone; /** * @symbol ?mPolishedBlackstone\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ @@ -253,26 +73,10 @@ namespace VanillaBlockTypes { * @symbol ?mPolishedBlackstoneBrickSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mPolishedBlackstoneBrickSlab; - /** - * @symbol ?mPolishedBlackstoneDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mPolishedBlackstoneDoubleSlab; - /** - * @symbol ?mPolishedBlackstoneSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mPolishedBlackstoneSlab; /** * @symbol ?mPolishedDeepslate\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mPolishedDeepslate; - /** - * @symbol ?mPolishedDeepslateDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mPolishedDeepslateDoubleSlab; - /** - * @symbol ?mPolishedDeepslateSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mPolishedDeepslateSlab; /** * @symbol ?mPortal\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ @@ -281,146 +85,38 @@ namespace VanillaBlockTypes { * @symbol ?mQuartzBricks\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mQuartzBricks; - /** - * @symbol ?mReinforcedDeepslate\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mReinforcedDeepslate; - /** - * @symbol ?mSculk\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mSculk; - /** - * @symbol ?mSculkCatalyst\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mSculkCatalyst; - /** - * @symbol ?mSculkSensor\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mSculkSensor; - /** - * @symbol ?mSculkShrieker\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mSculkShrieker; - /** - * @symbol ?mSculkVein\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mSculkVein; - /** - * @symbol ?mShulkerBox\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mShulkerBox; - /** - * @symbol ?mSmallAmethystBud\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mSmallAmethystBud; /** * @symbol ?mSmoothStone\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mSmoothStone; /** - * @symbol ?mStoneSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mSnifferEgg\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ - MCAPI extern class WeakPtr mStoneSlab; - /** - * @symbol ?mStoneSlab2\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mStoneSlab2; - /** - * @symbol ?mStoneSlab3\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mStoneSlab3; - /** - * @symbol ?mStoneSlab4\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mStoneSlab4; + MCAPI extern class WeakPtr mSnifferEgg; /** * @symbol ?mStrippedMangroveWood\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mStrippedMangroveWood; - /** - * @symbol ?mTuff\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mTuff; - /** - * @symbol ?mUndyedShulkerBox\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mUndyedShulkerBox; - /** - * @symbol ?mVerdantFroglight\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mVerdantFroglight; - /** - * @symbol ?mWarpedDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWarpedDoubleSlab; - /** - * @symbol ?mWarpedSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWarpedSlab; - /** - * @symbol ?mWaxedCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWaxedCutCopperSlab; /** * @symbol ?mWaxedCutCopperStairs\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mWaxedCutCopperStairs; - /** - * @symbol ?mWaxedDoubleCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWaxedDoubleCutCopperSlab; - /** - * @symbol ?mWaxedExposedCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWaxedExposedCutCopperSlab; /** * @symbol ?mWaxedExposedCutCopperStairs\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mWaxedExposedCutCopperStairs; - /** - * @symbol ?mWaxedExposedDoubleCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWaxedExposedDoubleCutCopperSlab; - /** - * @symbol ?mWaxedOxidizedCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWaxedOxidizedCutCopperSlab; /** * @symbol ?mWaxedOxidizedCutCopperStairs\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mWaxedOxidizedCutCopperStairs; - /** - * @symbol ?mWaxedOxidizedDoubleCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWaxedOxidizedDoubleCutCopperSlab; - /** - * @symbol ?mWaxedWeatheredCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWaxedWeatheredCutCopperSlab; /** * @symbol ?mWaxedWeatheredCutCopperStairs\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mWaxedWeatheredCutCopperStairs; - /** - * @symbol ?mWaxedWeatheredDoubleCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWaxedWeatheredDoubleCutCopperSlab; - /** - * @symbol ?mWeatheredCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWeatheredCutCopperSlab; /** * @symbol ?mWeatheredCutCopperStairs\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mWeatheredCutCopperStairs; - /** - * @symbol ?mWeatheredDoubleCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWeatheredDoubleCutCopperSlab; - /** - * @symbol ?mWoodenSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWoodenSlab; /** * @symbol ?registerBlocks\@VanillaBlockTypes\@\@YAXAEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/VanillaBlockUpdater.hpp b/LiteLoader/include/llapi/mc/VanillaBlockUpdater.hpp index f1b68ea76f..9e4374ad78 100644 --- a/LiteLoader/include/llapi/mc/VanillaBlockUpdater.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBlockUpdater.hpp @@ -91,6 +91,10 @@ class VanillaBlockUpdater { * @symbol ?addUpdaters_1_19_80\@VanillaBlockUpdater\@\@CAXAEAVCompoundTagUpdaterContext\@\@\@Z */ MCAPI static void addUpdaters_1_19_80(class CompoundTagUpdaterContext &); + /** + * @symbol ?addUpdaters_1_20_0\@VanillaBlockUpdater\@\@CAXAEAVCompoundTagUpdaterContext\@\@\@Z + */ + MCAPI static void addUpdaters_1_20_0(class CompoundTagUpdaterContext &); private: /** diff --git a/LiteLoader/include/llapi/mc/VanillaBlocks.hpp b/LiteLoader/include/llapi/mc/VanillaBlocks.hpp index 1100d9b255..1a229340e9 100644 --- a/LiteLoader/include/llapi/mc/VanillaBlocks.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBlocks.hpp @@ -25,138 +25,18 @@ namespace VanillaBlocks { * @symbol ?assignBlocks\@VanillaBlocks\@\@YAXAEBVExperiments\@\@\@Z */ MCAPI void assignBlocks(class Experiments const &); - /** - * @symbol ?mAmethystBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mAmethystBlock; - /** - * @symbol ?mAmethystCluster\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mAmethystCluster; /** * @symbol ?mBambooSapling\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mBambooSapling; - /** - * @symbol ?mBlackstoneDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mBlackstoneDoubleSlab; - /** - * @symbol ?mBlackstoneSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mBlackstoneSlab; - /** - * @symbol ?mBuddingAmethyst\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mBuddingAmethyst; - /** - * @symbol ?mCalcite\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mCalcite; - /** - * @symbol ?mChest\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mChest; - /** - * @symbol ?mChiseledDeepslate\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mChiseledDeepslate; /** * @symbol ?mChorusPlantBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mChorusPlantBlock; - /** - * @symbol ?mCobbledDeepslateDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mCobbledDeepslateDoubleSlab; - /** - * @symbol ?mCobbledDeepslateSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mCobbledDeepslateSlab; - /** - * @symbol ?mCrackedDeepslateTiles\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mCrackedDeepslateTiles; - /** - * @symbol ?mCrimsonDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mCrimsonDoubleSlab; /** * @symbol ?mCrimsonFungus\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mCrimsonFungus; - /** - * @symbol ?mCrimsonSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mCrimsonSlab; - /** - * @symbol ?mCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mCutCopperSlab; - /** - * @symbol ?mDeepslate\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mDeepslate; - /** - * @symbol ?mDeepslateBrickDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mDeepslateBrickDoubleSlab; - /** - * @symbol ?mDeepslateBrickSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mDeepslateBrickSlab; - /** - * @symbol ?mDeepslateTileDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mDeepslateTileDoubleSlab; - /** - * @symbol ?mDeepslateTileSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mDeepslateTileSlab; - /** - * @symbol ?mDeepslateTiles\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mDeepslateTiles; - /** - * @symbol ?mDoubleCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mDoubleCutCopperSlab; - /** - * @symbol ?mDoubleStoneSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mDoubleStoneSlab; - /** - * @symbol ?mDoubleStoneSlab2\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mDoubleStoneSlab2; - /** - * @symbol ?mDoubleStoneSlab3\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mDoubleStoneSlab3; - /** - * @symbol ?mDoubleStoneSlab4\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mDoubleStoneSlab4; - /** - * @symbol ?mDoubleWoodenSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mDoubleWoodenSlab; - /** - * @symbol ?mDripstone\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mDripstone; - /** - * @symbol ?mExposedCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mExposedCutCopperSlab; - /** - * @symbol ?mExposedDoubleCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mExposedDoubleCutCopperSlab; - /** - * @symbol ?mFrogSpawn\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mFrogSpawn; /** * @symbol ?mGildedBlackstone\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ @@ -165,14 +45,6 @@ namespace VanillaBlocks { * @symbol ?mGrassPathBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mGrassPathBlock; - /** - * @symbol ?mInfestedDeepslate\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mInfestedDeepslate; - /** - * @symbol ?mLargeAmethystBud\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mLargeAmethystBud; /** * @symbol ?mLodestoneBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ @@ -181,94 +53,18 @@ namespace VanillaBlocks { * @symbol ?mMagmaBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mMagmaBlock; - /** - * @symbol ?mMangroveDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mMangroveDoubleSlab; - /** - * @symbol ?mMangrovePropagule\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mMangrovePropagule; - /** - * @symbol ?mMangroveRoots\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mMangroveRoots; - /** - * @symbol ?mMangroveSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mMangroveSlab; /** * @symbol ?mMangroveWood\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mMangroveWood; - /** - * @symbol ?mMediumAmethystBud\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mMediumAmethystBud; - /** - * @symbol ?mMudBrickDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mMudBrickDoubleSlab; - /** - * @symbol ?mMudBrickSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mMudBrickSlab; - /** - * @symbol ?mMuddyMangroveRoots\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mMuddyMangroveRoots; - /** - * @symbol ?mOchreFroglight\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mOchreFroglight; - /** - * @symbol ?mOxidizedCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mOxidizedCutCopperSlab; - /** - * @symbol ?mOxidizedDoubleCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mOxidizedDoubleCutCopperSlab; - /** - * @symbol ?mPearlescentFroglight\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mPearlescentFroglight; - /** - * @symbol ?mPointedDripstone\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mPointedDripstone; /** * @symbol ?mPolishedBlackstone\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mPolishedBlackstone; - /** - * @symbol ?mPolishedBlackstoneBrickDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mPolishedBlackstoneBrickDoubleSlab; - /** - * @symbol ?mPolishedBlackstoneBrickSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mPolishedBlackstoneBrickSlab; - /** - * @symbol ?mPolishedBlackstoneDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mPolishedBlackstoneDoubleSlab; - /** - * @symbol ?mPolishedBlackstoneSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mPolishedBlackstoneSlab; /** * @symbol ?mPolishedDeepslate\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mPolishedDeepslate; - /** - * @symbol ?mPolishedDeepslateDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mPolishedDeepslateDoubleSlab; - /** - * @symbol ?mPolishedDeepslateSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mPolishedDeepslateSlab; /** * @symbol ?mPortal\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ @@ -277,138 +73,30 @@ namespace VanillaBlocks { * @symbol ?mQuartzBricks\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mQuartzBricks; - /** - * @symbol ?mReinforcedDeepslate\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mReinforcedDeepslate; - /** - * @symbol ?mSculk\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mSculk; - /** - * @symbol ?mSculkCatalyst\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mSculkCatalyst; - /** - * @symbol ?mSculkSensor\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mSculkSensor; - /** - * @symbol ?mSculkShrieker\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mSculkShrieker; - /** - * @symbol ?mSculkVein\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mSculkVein; - /** - * @symbol ?mShulkerBox\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mShulkerBox; - /** - * @symbol ?mSmallAmethystBud\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mSmallAmethystBud; /** * @symbol ?mSmoothStone\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mSmoothStone; /** - * @symbol ?mStoneSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mStoneSlab; - /** - * @symbol ?mStoneSlab2\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mStoneSlab2; - /** - * @symbol ?mStoneSlab3\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mSnifferEgg\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ - MCAPI extern class Block const * mStoneSlab3; - /** - * @symbol ?mStoneSlab4\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mStoneSlab4; + MCAPI extern class Block const * mSnifferEgg; /** * @symbol ?mStrippedMangroveWood\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mStrippedMangroveWood; - /** - * @symbol ?mTuff\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mTuff; - /** - * @symbol ?mUndyedShulkerBox\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mUndyedShulkerBox; - /** - * @symbol ?mVerdantFroglight\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mVerdantFroglight; /** * @symbol ?mVine\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mVine; - /** - * @symbol ?mWarpedDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWarpedDoubleSlab; /** * @symbol ?mWarpedFungus\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mWarpedFungus; - /** - * @symbol ?mWarpedSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWarpedSlab; /** * @symbol ?mWaterlily\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mWaterlily; - /** - * @symbol ?mWaxedCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWaxedCutCopperSlab; - /** - * @symbol ?mWaxedDoubleCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWaxedDoubleCutCopperSlab; - /** - * @symbol ?mWaxedExposedCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWaxedExposedCutCopperSlab; - /** - * @symbol ?mWaxedExposedDoubleCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWaxedExposedDoubleCutCopperSlab; - /** - * @symbol ?mWaxedOxidizedCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWaxedOxidizedCutCopperSlab; - /** - * @symbol ?mWaxedOxidizedDoubleCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWaxedOxidizedDoubleCutCopperSlab; - /** - * @symbol ?mWaxedWeatheredCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWaxedWeatheredCutCopperSlab; - /** - * @symbol ?mWaxedWeatheredDoubleCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWaxedWeatheredDoubleCutCopperSlab; - /** - * @symbol ?mWeatheredCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWeatheredCutCopperSlab; - /** - * @symbol ?mWeatheredDoubleCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWeatheredDoubleCutCopperSlab; - /** - * @symbol ?mWoodenSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWoodenSlab; /** * @symbol ?unassignBlocks\@VanillaBlocks\@\@YAXXZ */ diff --git a/LiteLoader/include/llapi/mc/VanillaEntityInitializerCommon.hpp b/LiteLoader/include/llapi/mc/VanillaEntityInitializerCommon.hpp index 364bb4ebb0..1f86286560 100644 --- a/LiteLoader/include/llapi/mc/VanillaEntityInitializerCommon.hpp +++ b/LiteLoader/include/llapi/mc/VanillaEntityInitializerCommon.hpp @@ -35,5 +35,9 @@ class VanillaEntityInitializerCommon { * @symbol ?initExperimentalMovement\@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 &); }; diff --git a/LiteLoader/include/llapi/mc/VanillaGameVersions.hpp b/LiteLoader/include/llapi/mc/VanillaGameVersions.hpp index 0a8ca40bbd..c941536774 100644 --- a/LiteLoader/include/llapi/mc/VanillaGameVersions.hpp +++ b/LiteLoader/include/llapi/mc/VanillaGameVersions.hpp @@ -57,18 +57,14 @@ namespace VanillaGameVersions { * @symbol ?NetherUpdate_U3\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B */ MCAPI extern class BaseGameVersion const NetherUpdate_U3; - /** - * @symbol ?NextMajorUpdateVersion\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B - */ - MCAPI extern class BaseGameVersion const NextMajorUpdateVersion; /** * @symbol ?SneakingHeightChangeVersion\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B */ MCAPI extern class BaseGameVersion const SneakingHeightChangeVersion; /** - * @symbol ?SnifferVersion\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B + * @symbol ?TrailsAndTalesVersion\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B */ - MCAPI extern class BaseGameVersion const SnifferVersion; + MCAPI extern class BaseGameVersion const TrailsAndTalesVersion; /** * @symbol ?WildUpdateVersion\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B */ diff --git a/LiteLoader/include/llapi/mc/VanillaItemNames.hpp b/LiteLoader/include/llapi/mc/VanillaItemNames.hpp index e3fdd29e84..34d7f67403 100644 --- a/LiteLoader/include/llapi/mc/VanillaItemNames.hpp +++ b/LiteLoader/include/llapi/mc/VanillaItemNames.hpp @@ -52,25 +52,25 @@ namespace VanillaItemNames { */ MCAPI extern class HashedString const AmethystShard; /** - * @symbol ?AnglerPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?AnglerPotterySherd\@VanillaItemNames\@\@3VHashedString\@\@B */ - MCAPI extern class HashedString const AnglerPotteryShard; + MCAPI extern class HashedString const AnglerPotterySherd; /** * @symbol ?Apple\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Apple; /** - * @symbol ?ArcherPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?ArcherPotterySherd\@VanillaItemNames\@\@3VHashedString\@\@B */ - MCAPI extern class HashedString const ArcherPotteryShard; + MCAPI extern class HashedString const ArcherPotterySherd; /** * @symbol ?ArmorStand\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ArmorStand; /** - * @symbol ?ArmsUpPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?ArmsUpPotterySherd\@VanillaItemNames\@\@3VHashedString\@\@B */ - MCAPI extern class HashedString const ArmsUpPotteryShard; + MCAPI extern class HashedString const ArmsUpPotterySherd; /** * @symbol ?Arrow\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -172,9 +172,9 @@ namespace VanillaItemNames { */ MCAPI extern class HashedString const BlackDye; /** - * @symbol ?BladePotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BladePotterySherd\@VanillaItemNames\@\@3VHashedString\@\@B */ - MCAPI extern class HashedString const BladePotteryShard; + MCAPI extern class HashedString const BladePotterySherd; /** * @symbol ?BlazePowder\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -232,9 +232,9 @@ namespace VanillaItemNames { */ MCAPI extern class HashedString const Bread; /** - * @symbol ?BrewerPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BrewerPotterySherd\@VanillaItemNames\@\@3VHashedString\@\@B */ - MCAPI extern class HashedString const BrewerPotteryShard; + MCAPI extern class HashedString const BrewerPotterySherd; /** * @symbol ?BrewingStand\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -260,9 +260,9 @@ namespace VanillaItemNames { */ MCAPI extern class HashedString const Bundle; /** - * @symbol ?BurnPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BurnPotterySherd\@VanillaItemNames\@\@3VHashedString\@\@B */ - MCAPI extern class HashedString const BurnPotteryShard; + MCAPI extern class HashedString const BurnPotterySherd; /** * @symbol ?Cake\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -484,9 +484,9 @@ namespace VanillaItemNames { */ MCAPI extern class HashedString const CyanDye; /** - * @symbol ?DangerPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?DangerPotterySherd\@VanillaItemNames\@\@3VHashedString\@\@B */ - MCAPI extern class HashedString const DangerPotteryShard; + MCAPI extern class HashedString const DangerPotterySherd; /** * @symbol ?DarkOakBoat\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -652,9 +652,9 @@ namespace VanillaItemNames { */ MCAPI extern class HashedString const ExperienceBottle; /** - * @symbol ?ExplorerPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?ExplorerPotterySherd\@VanillaItemNames\@\@3VHashedString\@\@B */ - MCAPI extern class HashedString const ExplorerPotteryShard; + MCAPI extern class HashedString const ExplorerPotterySherd; /** * @symbol ?EyeArmorTrimSmithingTemplate\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -712,9 +712,9 @@ namespace VanillaItemNames { */ MCAPI extern class HashedString const FoxSpawnEgg; /** - * @symbol ?FriendPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?FriendPotterySherd\@VanillaItemNames\@\@3VHashedString\@\@B */ - MCAPI extern class HashedString const FriendPotteryShard; + MCAPI extern class HashedString const FriendPotterySherd; /** * @symbol ?FrogSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -852,13 +852,13 @@ namespace VanillaItemNames { */ MCAPI extern class HashedString const HeartOfTheSea; /** - * @symbol ?HeartPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?HeartPotterySherd\@VanillaItemNames\@\@3VHashedString\@\@B */ - MCAPI extern class HashedString const HeartPotteryShard; + MCAPI extern class HashedString const HeartPotterySherd; /** - * @symbol ?HeartbreakPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?HeartbreakPotterySherd\@VanillaItemNames\@\@3VHashedString\@\@B */ - MCAPI extern class HashedString const HeartbreakPotteryShard; + MCAPI extern class HashedString const HeartbreakPotterySherd; /** * @symbol ?HoglinSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -888,9 +888,9 @@ namespace VanillaItemNames { */ MCAPI extern class HashedString const HostArmorTrimSmithingTemplate; /** - * @symbol ?HowlPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?HowlPotterySherd\@VanillaItemNames\@\@3VHashedString\@\@B */ - MCAPI extern class HashedString const HowlPotteryShard; + MCAPI extern class HashedString const HowlPotterySherd; /** * @symbol ?HuskSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1100,9 +1100,9 @@ namespace VanillaItemNames { */ MCAPI extern class HashedString const Minecart; /** - * @symbol ?MinerPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MinerPotterySherd\@VanillaItemNames\@\@3VHashedString\@\@B */ - MCAPI extern class HashedString const MinerPotteryShard; + MCAPI extern class HashedString const MinerPotterySherd; /** * @symbol ?MojangBannerPattern\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1112,9 +1112,9 @@ namespace VanillaItemNames { */ MCAPI extern class HashedString const MooshroomSpawnEgg; /** - * @symbol ?MournerPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MournerPotterySherd\@VanillaItemNames\@\@3VHashedString\@\@B */ - MCAPI extern class HashedString const MournerPotteryShard; + MCAPI extern class HashedString const MournerPotterySherd; /** * @symbol ?MuleSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1167,6 +1167,10 @@ namespace VanillaItemNames { * @symbol ?MusicDiscPigstep\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MusicDiscPigstep; + /** + * @symbol ?MusicDiscRelic\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const MusicDiscRelic; /** * @symbol ?MusicDiscStal\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1344,9 +1348,13 @@ namespace VanillaItemNames { */ MCAPI extern class HashedString const PinkDye; /** - * @symbol ?PlentyPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?PitcherPod\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const PitcherPod; + /** + * @symbol ?PlentyPotterySherd\@VanillaItemNames\@\@3VHashedString\@\@B */ - MCAPI extern class HashedString const PlentyPotteryShard; + MCAPI extern class HashedString const PlentyPotterySherd; /** * @symbol ?PoisonousPotato\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1388,9 +1396,9 @@ namespace VanillaItemNames { */ MCAPI extern class HashedString const PrismarineShard; /** - * @symbol ?PrizePotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?PrizePotterySherd\@VanillaItemNames\@\@3VHashedString\@\@B */ - MCAPI extern class HashedString const PrizePotteryShard; + MCAPI extern class HashedString const PrizePotterySherd; /** * @symbol ?Pufferfish\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1516,9 +1524,9 @@ namespace VanillaItemNames { */ MCAPI extern class HashedString const ShaperArmorTrimSmithingTemplate; /** - * @symbol ?SheafPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SheafPotterySherd\@VanillaItemNames\@\@3VHashedString\@\@B */ - MCAPI extern class HashedString const SheafPotteryShard; + MCAPI extern class HashedString const SheafPotterySherd; /** * @symbol ?Shears\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1528,9 +1536,9 @@ namespace VanillaItemNames { */ MCAPI extern class HashedString const SheepSpawnEgg; /** - * @symbol ?ShelterPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?ShelterPotterySherd\@VanillaItemNames\@\@3VHashedString\@\@B */ - MCAPI extern class HashedString const ShelterPotteryShard; + MCAPI extern class HashedString const ShelterPotterySherd; /** * @symbol ?Shield\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1572,9 +1580,9 @@ namespace VanillaItemNames { */ MCAPI extern class HashedString const SkullBannerPattern; /** - * @symbol ?SkullPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SkullPotterySherd\@VanillaItemNames\@\@3VHashedString\@\@B */ - MCAPI extern class HashedString const SkullPotteryShard; + MCAPI extern class HashedString const SkullPotterySherd; /** * @symbol ?SlimeBall\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1588,9 +1596,9 @@ namespace VanillaItemNames { */ MCAPI extern class HashedString const SnifferSpawnEgg; /** - * @symbol ?SnortPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SnortPotterySherd\@VanillaItemNames\@\@3VHashedString\@\@B */ - MCAPI extern class HashedString const SnortPotteryShard; + MCAPI extern class HashedString const SnortPotterySherd; /** * @symbol ?SnoutArmorTrimSmithingTemplate\@VanillaItemNames\@\@3VHashedString\@\@B */ diff --git a/LiteLoader/include/llapi/mc/VanillaItemTags.hpp b/LiteLoader/include/llapi/mc/VanillaItemTags.hpp index c15d71bb2e..045631560c 100644 --- a/LiteLoader/include/llapi/mc/VanillaItemTags.hpp +++ b/LiteLoader/include/llapi/mc/VanillaItemTags.hpp @@ -74,9 +74,9 @@ class VanillaItemTags { */ MCAPI static struct ItemTag const CrimsonStems; /** - * @symbol ?DecoratedPotShards\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?DecoratedPotSherds\@VanillaItemTags\@\@2UItemTag\@\@B */ - MCAPI static struct ItemTag const DecoratedPotShards; + MCAPI static struct ItemTag const DecoratedPotSherds; /** * @symbol ?DiamondTier\@VanillaItemTags\@\@2UItemTag\@\@B */ diff --git a/LiteLoader/include/llapi/mc/VanillaOffsetSystem.hpp b/LiteLoader/include/llapi/mc/VanillaOffsetSystem.hpp new file mode 100644 index 0000000000..f9e55ad965 --- /dev/null +++ b/LiteLoader/include/llapi/mc/VanillaOffsetSystem.hpp @@ -0,0 +1,57 @@ +/** + * @file VanillaOffsetSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct VanillaOffsetSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_VANILLAOFFSETSYSTEM +public: + struct VanillaOffsetSystem& operator=(struct VanillaOffsetSystem const &) = delete; + VanillaOffsetSystem(struct VanillaOffsetSystem const &) = delete; + VanillaOffsetSystem() = 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\@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 + */ + virtual void tick(class StrictExecutionContext>, struct Read>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); + /** + * @symbol ?createSystem\@VanillaOffsetSystem\@\@SA?AUTickingSystemWithInfo\@\@_N0\@Z + */ + MCAPI static struct TickingSystemWithInfo createSystem(bool, bool); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/VanillaOffsetSystemUtil.hpp b/LiteLoader/include/llapi/mc/VanillaOffsetSystemUtil.hpp new file mode 100644 index 0000000000..84fcb0c336 --- /dev/null +++ b/LiteLoader/include/llapi/mc/VanillaOffsetSystemUtil.hpp @@ -0,0 +1,32 @@ +/** + * @file VanillaOffsetSystemUtil.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace VanillaOffsetSystemUtil { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?_clientTick\@VanillaOffsetSystemUtil\@\@YAXAEAVStrictEntityContext\@\@AEAUVanillaOffsetComponent\@\@AEBUOffsetsComponent\@\@AEBUSynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UPlayerIsSleepingFlag\@\@\@\@\@\@M\@Z + */ + MCAPI void _clientTick(class StrictEntityContext &, struct VanillaOffsetComponent &, struct OffsetsComponent const &, struct SynchedActorDataComponent const &, class Optional const>, float); + /** + * @symbol ?_serverTick\@VanillaOffsetSystemUtil\@\@YAXAEAVStrictEntityContext\@\@AEAUVanillaOffsetComponent\@\@AEBUOffsetsComponent\@\@AEBUSynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UPlayerIsSleepingFlag\@\@\@\@\@\@M\@Z + */ + MCAPI void _serverTick(class StrictEntityContext &, struct VanillaOffsetComponent &, struct OffsetsComponent const &, struct SynchedActorDataComponent const &, class Optional const>, float); + /** + * @symbol ?getCameraOffset\@VanillaOffsetSystemUtil\@\@YAMAEBUSynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UPlayerIsSleepingFlag\@\@\@\@\@\@M\@Z + */ + MCAPI float getCameraOffset(struct SynchedActorDataComponent const &, class Optional const>, float); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/VanillaStates.hpp b/LiteLoader/include/llapi/mc/VanillaStates.hpp index 5058d556c2..ca36e7e3fd 100644 --- a/LiteLoader/include/llapi/mc/VanillaStates.hpp +++ b/LiteLoader/include/llapi/mc/VanillaStates.hpp @@ -303,9 +303,9 @@ struct CachedItemStateMapPtr { */ MCAPI extern class BlockStateVariant const MultiFaceDirectionBits; /** - * @symbol ?NewLeafType\@VanillaStates\@\@3V?$BlockStateVariant\@W4NewLeafType\@\@\@\@B + * @symbol ?NewLeavesType\@VanillaStates\@\@3V?$BlockStateVariant\@W4NewLeavesType\@\@\@\@B */ - MCAPI extern class BlockStateVariant const NewLeafType; + MCAPI extern class BlockStateVariant const NewLeavesType; /** * @symbol ?NewLogType\@VanillaStates\@\@3V?$BlockStateVariant\@W4NewLogType\@\@\@\@B */ @@ -319,9 +319,9 @@ struct CachedItemStateMapPtr { */ MCAPI extern class BlockStateVariant const OccupiedBit; /** - * @symbol ?OldLeafType\@VanillaStates\@\@3V?$BlockStateVariant\@W4OldLeafType\@\@\@\@B + * @symbol ?OldLeavesType\@VanillaStates\@\@3V?$BlockStateVariant\@W4OldLeavesType\@\@\@\@B */ - MCAPI extern class BlockStateVariant const OldLeafType; + MCAPI extern class BlockStateVariant const OldLeavesType; /** * @symbol ?OldLogType\@VanillaStates\@\@3V?$BlockStateVariant\@W4OldLogType\@\@\@\@B */ @@ -386,22 +386,26 @@ struct CachedItemStateMapPtr { * @symbol ?Rotation\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ MCAPI extern class BlockStateVariant const Rotation; - /** - * @symbol ?SandStoneType\@VanillaStates\@\@3V?$BlockStateVariant\@W4SandStoneType\@\@\@\@B - */ - MCAPI extern class BlockStateVariant const SandStoneType; /** * @symbol ?SandType\@VanillaStates\@\@3V?$BlockStateVariant\@W4SandType\@\@\@\@B */ MCAPI extern class BlockStateVariant const SandType; + /** + * @symbol ?SandstoneType\@VanillaStates\@\@3V?$BlockStateVariant\@W4SandstoneType\@\@\@\@B + */ + MCAPI extern class BlockStateVariant const SandstoneType; /** * @symbol ?SaplingType\@VanillaStates\@\@3V?$BlockStateVariant\@W4SaplingType\@\@\@\@B */ MCAPI extern class BlockStateVariant const SaplingType; /** - * @symbol ?SeaGrassType\@VanillaStates\@\@3V?$BlockStateVariant\@W4SeaGrassType\@\@\@\@B + * @symbol ?SculkSensorPhase\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B + */ + MCAPI extern class BlockStateVariant const SculkSensorPhase; + /** + * @symbol ?SeagrassType\@VanillaStates\@\@3V?$BlockStateVariant\@W4SeagrassType\@\@\@\@B */ - MCAPI extern class BlockStateVariant const SeaGrassType; + MCAPI extern class BlockStateVariant const SeagrassType; /** * @symbol ?SpongeType\@VanillaStates\@\@3V?$BlockStateVariant\@W4SpongeType\@\@\@\@B */ diff --git a/LiteLoader/include/llapi/mc/VanillaSystemsRegistration.hpp b/LiteLoader/include/llapi/mc/VanillaSystemsRegistration.hpp index a78888487b..84004cd544 100644 --- a/LiteLoader/include/llapi/mc/VanillaSystemsRegistration.hpp +++ b/LiteLoader/include/llapi/mc/VanillaSystemsRegistration.hpp @@ -46,6 +46,10 @@ namespace VanillaSystemsRegistration { * @symbol ?registerActorPositionPassenger\@VanillaSystemsRegistration\@\@YAXAEAVIEntitySystems\@\@AEBURegistrationOptions\@1\@\@Z */ MCAPI void registerActorPositionPassenger(class IEntitySystems &, 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 */ @@ -55,17 +59,13 @@ namespace VanillaSystemsRegistration { */ MCAPI void registerExtractApplyBlock(struct VanillaSystemsRegistration::DependencyInfo &, enum class VanillaSystemsRegistration::ExtractApplyMode, enum class SideBySideExtractionId, class EntitySystems &, struct VanillaSystemsRegistration::RegistrationOptions const &, class std::function const &); /** - * @symbol ?registerPassengerTick\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@AEAUDependencyInfo\@1\@AEBURegistrationOptions\@1\@\@Z + * @symbol ?registerPassengerTick\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@AEBURegistrationOptions\@1\@\@Z */ - MCAPI void registerPassengerTick(class EntitySystems &, struct VanillaSystemsRegistration::DependencyInfo &, struct VanillaSystemsRegistration::RegistrationOptions const &); + MCAPI void registerPassengerTick(class EntitySystems &, struct VanillaSystemsRegistration::RegistrationOptions const &); /** * @symbol ?registerRemovePassengerSystems\@VanillaSystemsRegistration\@\@YAXAEAVIEntitySystems\@\@AEBURegistrationOptions\@1\@\@Z */ MCAPI void registerRemovePassengerSystems(class IEntitySystems &, struct VanillaSystemsRegistration::RegistrationOptions const &); - /** - * @symbol ?registerSetPosSystems\@VanillaSystemsRegistration\@\@YAXAEAVIEntitySystems\@\@AEBURegistrationOptions\@1\@\@Z - */ - MCAPI void registerSetPosSystems(class IEntitySystems &, struct VanillaSystemsRegistration::RegistrationOptions const &); /** * @symbol ?registerSharedVanillaPlayerInteractionSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@\@Z */ @@ -74,6 +74,10 @@ namespace VanillaSystemsRegistration { * @symbol ?registerTickFilterSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@\@Z */ MCAPI void registerTickFilterSystems(class EntitySystems &); + /** + * @symbol ?registerUpdateMobTravelSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@AEBURegistrationOptions\@1\@\@Z + */ + MCAPI void registerUpdateMobTravelSystems(class EntitySystems &, struct VanillaSystemsRegistration::RegistrationOptions const &); /** * @symbol ?registerVanillaServerTickingSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@V?$not_null\@V?$NonOwnerPointer\@$$CBVILevel\@\@\@Bedrock\@\@\@gsl\@\@AEBURegistrationOptions\@1\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/Vex.hpp b/LiteLoader/include/llapi/mc/Vex.hpp index d593a4aabc..abc18e4acb 100644 --- a/LiteLoader/include/llapi/mc/Vex.hpp +++ b/LiteLoader/include/llapi/mc/Vex.hpp @@ -47,145 +47,140 @@ class Vex : public Monster { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 59 + * @vftbl 58 * @symbol ?isInWall\@Vex\@\@UEBA_NXZ */ virtual bool isInWall() const; /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 - */ - virtual void __unk_vfn_260(); - /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@Vex\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@Vex\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 287 + * @vftbl 279 * @symbol ?applyFinalFriction\@Vex\@\@UEAAXM_N\@Z */ virtual void applyFinalFriction(float, bool); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0Vex\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/VibrationListener.hpp b/LiteLoader/include/llapi/mc/VibrationListener.hpp index d7def5358a..1281bd5260 100644 --- a/LiteLoader/include/llapi/mc/VibrationListener.hpp +++ b/LiteLoader/include/llapi/mc/VibrationListener.hpp @@ -75,6 +75,10 @@ class VibrationListener { * @symbol ?_requestVibrationParticle\@VibrationListener\@\@AEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@M\@Z */ MCAPI void _requestVibrationParticle(class BlockSource &, class BlockPos const &, float); + /** + * @symbol ?_tickInternal\@VibrationListener\@\@AEAAXAEAVBlockSource\@\@\@Z + */ + MCAPI void _tickInternal(class BlockSource &); /** * @symbol ?_trySendSneakCloseToSculkSensorEventPacket\@VibrationListener\@\@AEAAXAEAVBlockSource\@\@AEBVGameEvent\@\@AEBUGameEventContext\@\@AEBVVec3\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/VibrationListenerConfig.hpp b/LiteLoader/include/llapi/mc/VibrationListenerConfig.hpp index cbbca6ff78..d5e8582725 100644 --- a/LiteLoader/include/llapi/mc/VibrationListenerConfig.hpp +++ b/LiteLoader/include/llapi/mc/VibrationListenerConfig.hpp @@ -29,6 +29,10 @@ class VibrationListenerConfig { * @symbol ?isValidVibration\@VibrationListenerConfig\@\@UEAA_NAEBVGameEvent\@\@\@Z */ MCVAPI bool isValidVibration(class GameEvent const &); + /** + * @symbol ?onSerializableDataChanged\@VibrationListenerConfig\@\@UEAAXAEAVBlockSource\@\@\@Z + */ + MCVAPI void onSerializableDataChanged(class BlockSource &); #endif }; diff --git a/LiteLoader/include/llapi/mc/Villager.hpp b/LiteLoader/include/llapi/mc/Villager.hpp index 0408c59d58..e76999923f 100644 --- a/LiteLoader/include/llapi/mc/Villager.hpp +++ b/LiteLoader/include/llapi/mc/Villager.hpp @@ -42,130 +42,125 @@ class Villager : public VillagerBase { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 - */ - virtual void __unk_vfn_192(); - /** - * @vftbl 199 + * @vftbl 197 * @symbol ?buildDebugInfo\@Villager\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void buildDebugInfo(std::string &) const; /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 + */ + virtual void __unk_vfn_215(); + /** + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); - /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0Villager\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/VillagerBase.hpp b/LiteLoader/include/llapi/mc/VillagerBase.hpp index b52c03189e..5347b2cf5f 100644 --- a/LiteLoader/include/llapi/mc/VillagerBase.hpp +++ b/LiteLoader/include/llapi/mc/VillagerBase.hpp @@ -43,155 +43,150 @@ class VillagerBase : public Mob { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 138 + * @vftbl 136 * @symbol ?onLightningHit\@VillagerBase\@\@UEAAXXZ */ virtual void onLightningHit(); /** - * @vftbl 141 + * @vftbl 139 * @symbol ?handleEntityEvent\@VillagerBase\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@VillagerBase\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@VillagerBase\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 274 + * @vftbl 266 * @symbol ?_onSizeUpdated\@VillagerBase\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 347 + * @vftbl 339 * @symbol ?_serverAiMobStep\@VillagerBase\@\@MEAAXXZ */ virtual void _serverAiMobStep(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); #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 68ef3e65fa..33386cc57c 100644 --- a/LiteLoader/include/llapi/mc/VillagerV2.hpp +++ b/LiteLoader/include/llapi/mc/VillagerV2.hpp @@ -47,160 +47,155 @@ class VillagerV2 : public VillagerBase { */ virtual void remove(); /** - * @vftbl 21 + * @vftbl 20 * @symbol ?isRuntimePredictedMovementEnabled\@VillagerV2\@\@UEBA_NXZ */ virtual bool isRuntimePredictedMovementEnabled() const; /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 - */ - virtual void __unk_vfn_192(); - /** - * @vftbl 199 + * @vftbl 197 * @symbol ?buildDebugInfo\@VillagerV2\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void buildDebugInfo(std::string &) const; /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 230 + * @vftbl 222 * @symbol ?getInteraction\@VillagerV2\@\@UEAA_NAEAVPlayer\@\@AEAVActorInteraction\@\@AEBVVec3\@\@\@Z */ virtual bool getInteraction(class Player &, class ActorInteraction &, class Vec3 const &); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 245 + * @vftbl 237 * @symbol ?die\@VillagerV2\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 258 + * @vftbl 250 * @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 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); - /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 286 + * @vftbl 278 * @symbol ?travel\@VillagerV2\@\@UEAAXMMM_N\@Z */ virtual void travel(float, float, float, bool); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 346 + * @vftbl 338 * @symbol ?newServerAiStep\@VillagerV2\@\@UEAAXXZ */ virtual void newServerAiStep(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0VillagerV2\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/VillagerV2PreTravelSystem.hpp b/LiteLoader/include/llapi/mc/VillagerV2PreTravelSystem.hpp index f33b1c3c04..c956d80637 100644 --- a/LiteLoader/include/llapi/mc/VillagerV2PreTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/VillagerV2PreTravelSystem.hpp @@ -34,6 +34,10 @@ 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 8cfae73fb2..c2f567ae4b 100644 --- a/LiteLoader/include/llapi/mc/VindicationIllager.hpp +++ b/LiteLoader/include/llapi/mc/VindicationIllager.hpp @@ -37,130 +37,125 @@ class VindicationIllager : public HumanoidMonster { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_267(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_293(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_297(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 - */ - virtual void __unk_vfn_305(); - /** - * @vftbl 337 + * @vftbl 329 * @symbol ?_getWalkTargetValue\@VindicationIllager\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); #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 938f505eff..7afcaf5606 100644 --- a/LiteLoader/include/llapi/mc/VineBlock.hpp +++ b/LiteLoader/include/llapi/mc/VineBlock.hpp @@ -45,16 +45,21 @@ class VineBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class VineBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class VineBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,162 +136,157 @@ class VineBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 91 + * @vftbl 90 * @symbol ?mayPlace\@VineBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@VineBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 136 + * @vftbl 134 * @symbol ?getColor\@VineBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 137 + * @vftbl 135 * @symbol ?getColor\@VineBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 143 + * @vftbl 141 * @symbol ?getVisualShapeInWorld\@VineBlock\@\@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 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@VineBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 + * @vftbl 171 * @symbol ?randomTick\@VineBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@VineBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 + * @vftbl 185 * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 + * @vftbl 187 * @symbol ?playerDestroy\@VineBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 190 + * @vftbl 189 * @symbol ?getResourceCount\@VineBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/VoidGenerator.hpp b/LiteLoader/include/llapi/mc/VoidGenerator.hpp new file mode 100644 index 0000000000..bd075ec175 --- /dev/null +++ b/LiteLoader/include/llapi/mc/VoidGenerator.hpp @@ -0,0 +1,82 @@ +/** + * @file VoidGenerator.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class VoidGenerator { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_VOIDGENERATOR +public: + class VoidGenerator& operator=(class VoidGenerator const &) = delete; + VoidGenerator(class VoidGenerator const &) = delete; + VoidGenerator() = delete; +#endif + +public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_VOIDGENERATOR + /** + * @symbol ?createNoiseCache\@VoidGenerator\@\@MEBA?AVChunkLocalNoiseCache\@\@VChunkPos\@\@\@Z + */ + MCVAPI class ChunkLocalNoiseCache createNoiseCache(class ChunkPos) const; + /** + * @symbol ?createWorldGenCache\@VoidGenerator\@\@MEBA?AVWorldGenCache\@\@VChunkPos\@\@\@Z + */ + MCVAPI class WorldGenCache createWorldGenCache(class ChunkPos) const; + /** + * @symbol ?decorateWorldGenLoadChunk\@VoidGenerator\@\@MEBAXAEAVBiome\@\@AEAVLevelChunk\@\@AEAVBlockVolumeTarget\@\@AEAVRandom\@\@AEBVChunkPos\@\@\@Z + */ + MCVAPI void decorateWorldGenLoadChunk(class Biome &, class LevelChunk &, class BlockVolumeTarget &, class Random &, class ChunkPos const &) const; + /** + * @symbol ?decorateWorldGenPostProcess\@VoidGenerator\@\@MEBAXAEAVBiome\@\@AEAVLevelChunk\@\@AEAVBlockSource\@\@AEAVRandom\@\@\@Z + */ + MCVAPI void decorateWorldGenPostProcess(class Biome &, class LevelChunk &, class BlockSource &, class Random &) const; + /** + * @symbol ?findSpawnPosition\@VoidGenerator\@\@UEBA?AVBlockPos\@\@XZ + */ + MCVAPI class BlockPos findSpawnPosition() const; + /** + * @symbol ?getBiomeArea\@VoidGenerator\@\@UEBA?AVBiomeArea\@\@AEBVBoundingBox\@\@I\@Z + */ + MCVAPI class BiomeArea getBiomeArea(class BoundingBox const &, unsigned int) const; + /** + * @symbol ?getBiomeSource\@VoidGenerator\@\@UEBAAEBVBiomeSource\@\@XZ + */ + MCVAPI class BiomeSource const & getBiomeSource() const; + /** + * @symbol ?getBlockVolumeDimensions\@VoidGenerator\@\@UEBA?AUBlockVolumeDimensions\@WorldGenerator\@\@XZ + */ + MCVAPI struct WorldGenerator::BlockVolumeDimensions getBlockVolumeDimensions() const; + /** + * @symbol ?loadChunk\@VoidGenerator\@\@UEAAXAEAVLevelChunk\@\@_N\@Z + */ + MCVAPI void loadChunk(class LevelChunk &, bool); + /** + * @symbol ?postProcess\@VoidGenerator\@\@UEAA_NAEAVChunkViewSource\@\@\@Z + */ + MCVAPI bool postProcess(class ChunkViewSource &); + /** + * @symbol ?prepareAndComputeHeights\@VoidGenerator\@\@UEAAXAEAVBlockVolume\@\@AEBVChunkPos\@\@AEAV?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@_NH\@Z + */ + MCVAPI void prepareAndComputeHeights(class BlockVolume &, class ChunkPos const &, std::vector &, bool, int); + /** + * @symbol ?prepareHeights\@VoidGenerator\@\@UEAAXAEAVBlockVolume\@\@AEBVChunkPos\@\@_N\@Z + */ + MCVAPI void prepareHeights(class BlockVolume &, class ChunkPos const &, bool); +#endif + /** + * @symbol ??0VoidGenerator\@\@QEAA\@AEAVDimension\@\@\@Z + */ + MCAPI VoidGenerator(class Dimension &); + +}; diff --git a/LiteLoader/include/llapi/mc/VolumeEntityManagerServer.hpp b/LiteLoader/include/llapi/mc/VolumeEntityManagerServer.hpp index f4fab5da8a..907111abf9 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\@\@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 ?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 ?sendAllVolumesToClient\@VolumeEntityManagerServer\@\@QEBAXAEBVUserEntityIdentifierComponent\@\@AEBVNetworkIdentifier\@\@AEAVPacketSender\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/WallBlock.hpp b/LiteLoader/include/llapi/mc/WallBlock.hpp index 7c2b1f65d8..d4d82a8042 100644 --- a/LiteLoader/include/llapi/mc/WallBlock.hpp +++ b/LiteLoader/include/llapi/mc/WallBlock.hpp @@ -60,16 +60,21 @@ class WallBlock : public BlockLegacy { * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -81,10 +86,10 @@ class WallBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -116,10 +121,10 @@ class WallBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -146,15 +151,15 @@ class WallBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -162,161 +167,161 @@ class WallBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@WallBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 77 + * @vftbl 76 * @symbol ?onStructureBlockPlace\@WallBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onStructureBlockPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 78 + * @vftbl 77 * @symbol ?onStructureNeighborBlockPlace\@WallBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onStructureNeighborBlockPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 96 + * @vftbl 95 * @symbol ?breaksFallingBlocks\@WallBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@WallBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@WallBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 106 + * @vftbl 105 * @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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@WallBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 143 + * @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 147 + * @vftbl 145 * @symbol ?getVariant\@WallBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@WallBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@WallBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 174 + * @symbol ?clip\@WallBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z */ - virtual void __unk_vfn_179(); + virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; /** - * @vftbl 186 + * @vftbl 177 + * @symbol __unk_vfn_177 + */ + virtual void __unk_vfn_177(); + /** + * @vftbl 185 * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @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 12a6103acc..baf164246d 100644 --- a/LiteLoader/include/llapi/mc/WanderingTrader.hpp +++ b/LiteLoader/include/llapi/mc/WanderingTrader.hpp @@ -37,135 +37,130 @@ class WanderingTrader : public Mob { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 167 + * @vftbl 165 * @symbol ?getEntityTypeId\@WanderingTrader\@\@UEBA?AW4ActorType\@\@XZ */ virtual enum class ActorType getEntityTypeId() const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 258 + * @vftbl 250 * @symbol ?updateEntitySpecificMolangVariables\@WanderingTrader\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); + /** + * @vftbl 252 + * @symbol __unk_vfn_252 + */ + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); - /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); #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 e89c3da837..f95429c288 100644 --- a/LiteLoader/include/llapi/mc/Warden.hpp +++ b/LiteLoader/include/llapi/mc/Warden.hpp @@ -35,175 +35,170 @@ class Warden : public Monster { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 43 + * @vftbl 42 * @symbol ?canDisableShield\@Warden\@\@UEAA_NXZ */ virtual bool canDisableShield(); /** - * @vftbl 49 + * @vftbl 48 * @symbol ?normalTick\@Warden\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 114 + * @vftbl 112 * @symbol ?setTarget\@Warden\@\@UEAAXPEAVActor\@\@\@Z */ virtual void setTarget(class Actor *); /** - * @vftbl 134 + * @vftbl 132 * @symbol ?isInvulnerableTo\@Warden\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 187 + * @vftbl 185 * @symbol ?onSynchedDataUpdate\@Warden\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 251 + * @vftbl 243 * @symbol ?onPush\@Warden\@\@UEAAXAEAVActor\@\@\@Z */ virtual void onPush(class Actor &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@Warden\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 293 + * @vftbl 285 * @symbol ?checkSpawnRules\@Warden\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 294 + * @vftbl 286 * @symbol ?checkSpawnObstruction\@Warden\@\@UEBA_NXZ */ virtual bool checkSpawnObstruction() const; /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 304 + * @vftbl 296 * @symbol ?doHurtTarget\@Warden\@\@MEAA_NPEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z */ virtual bool doHurtTarget(class Actor *, enum class ActorDamageCause const &); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0Warden\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/WardenVibrationConfig.hpp b/LiteLoader/include/llapi/mc/WardenVibrationConfig.hpp index 48082e3395..3e266c8f04 100644 --- a/LiteLoader/include/llapi/mc/WardenVibrationConfig.hpp +++ b/LiteLoader/include/llapi/mc/WardenVibrationConfig.hpp @@ -34,9 +34,9 @@ class WardenVibrationConfig { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?onSignalReceive\@WardenVibrationConfig\@\@UEAAXAEAVBlockSource\@\@VBlockPos\@\@AEBVGameEvent\@\@PEAVActor\@\@M3\@Z + * @symbol ?onSignalReceive\@WardenVibrationConfig\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVGameEvent\@\@PEAVActor\@\@MI3\@Z */ - virtual void onSignalReceive(class BlockSource &, class BlockPos, class GameEvent const &, class Actor *, float, class Actor *); + virtual void onSignalReceive(class BlockSource &, class BlockPos const &, class GameEvent const &, class Actor *, float, unsigned int, class Actor *); /** * @vftbl 2 * @symbol ?isValidVibration\@WardenVibrationConfig\@\@UEAA_NAEBVGameEvent\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/WarpedFungusOnAStickItem.hpp b/LiteLoader/include/llapi/mc/WarpedFungusOnAStickItem.hpp index 97acd4e067..a004a126c1 100644 --- a/LiteLoader/include/llapi/mc/WarpedFungusOnAStickItem.hpp +++ b/LiteLoader/include/llapi/mc/WarpedFungusOnAStickItem.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 WarpedFungusOnAStickItem. * */ -class WarpedFungusOnAStickItem : public Item { +class WarpedFungusOnAStickItem : public ComponentItem { #define AFTER_EXTRA // Add Member There @@ -36,11 +36,6 @@ class WarpedFungusOnAStickItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class WarpedFungusOnAStickItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 49 * @symbol ?isHandEquipped\@WarpedFungusOnAStickItem\@\@UEBA_NXZ @@ -126,5 +126,19 @@ class WarpedFungusOnAStickItem : public Item { * @symbol ?mineBlock\@WarpedFungusOnAStickItem\@\@UEBA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z */ virtual bool mineBlock(class ItemStack &, class Block const &, int, int, int, class Actor *) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @symbol ??0WarpedFungusOnAStickItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + */ + MCAPI WarpedFungusOnAStickItem(std::string const &, int); }; diff --git a/LiteLoader/include/llapi/mc/WaterAnimal.hpp b/LiteLoader/include/llapi/mc/WaterAnimal.hpp index e5b8f1d08a..86de1eb217 100644 --- a/LiteLoader/include/llapi/mc/WaterAnimal.hpp +++ b/LiteLoader/include/llapi/mc/WaterAnimal.hpp @@ -37,137 +37,132 @@ class WaterAnimal : public Mob { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_190(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_267(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 - */ - virtual void __unk_vfn_275(); - /** - * @vftbl 293 + * @vftbl 285 * @symbol ?checkSpawnRules\@WaterAnimal\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** - * @vftbl 353 + * @vftbl 345 * @symbol ?getFlopVerticalVelocityFactor\@WaterAnimal\@\@UEBAMXZ */ virtual float getFlopVerticalVelocityFactor() const; /** - * @vftbl 354 + * @vftbl 346 * @symbol ?getFlopHorizontalVelocityFactor\@WaterAnimal\@\@UEBAMXZ */ virtual float getFlopHorizontalVelocityFactor() const; diff --git a/LiteLoader/include/llapi/mc/WaterLilyBlockItem.hpp b/LiteLoader/include/llapi/mc/WaterLilyBlockItem.hpp index b681cf0307..6d49d1051e 100644 --- a/LiteLoader/include/llapi/mc/WaterLilyBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/WaterLilyBlockItem.hpp @@ -36,11 +36,6 @@ class WaterLilyBlockItem : public BlockItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class WaterLilyBlockItem : public BlockItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -107,12 +107,22 @@ class WaterLilyBlockItem : public BlockItem { */ virtual void __unk_vfn_80(); /** - * @vftbl 131 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 133 * @symbol ?_calculatePlacePos\@WaterLilyBlockItem\@\@UEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 132 + * @vftbl 134 * @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/WaterSinkInputSystem.hpp b/LiteLoader/include/llapi/mc/WaterSinkInputSystem.hpp index c44a6a7b32..90aeef672b 100644 --- a/LiteLoader/include/llapi/mc/WaterSinkInputSystem.hpp +++ b/LiteLoader/include/llapi/mc/WaterSinkInputSystem.hpp @@ -31,5 +31,13 @@ class WaterSinkInputSystem { * @symbol ?createWaterSinkInputSystem\@WaterSinkInputSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createWaterSinkInputSystem(); + /** + * @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/WaterlilyBlock.hpp b/LiteLoader/include/llapi/mc/WaterlilyBlock.hpp index 728d64cbbb..fd6711b622 100644 --- a/LiteLoader/include/llapi/mc/WaterlilyBlock.hpp +++ b/LiteLoader/include/llapi/mc/WaterlilyBlock.hpp @@ -5,7 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "BlockLegacy.hpp" +#include "BushBlock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +16,7 @@ * @brief MC class WaterlilyBlock. * */ -class WaterlilyBlock : public BlockLegacy { +class WaterlilyBlock : public BushBlock { #define AFTER_EXTRA // Add Member There @@ -45,16 +45,21 @@ class WaterlilyBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -67,14 +72,14 @@ class WaterlilyBlock : public BlockLegacy { virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol __unk_vfn_34 + * @symbol ?isWaterBlocking\@WaterlilyBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_34(); + virtual bool isWaterBlocking() const; /** * @vftbl 35 - * @symbol ?isWaterBlocking\@WaterlilyBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_35 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +111,10 @@ class WaterlilyBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,15 +141,15 @@ class WaterlilyBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -152,119 +157,114 @@ class WaterlilyBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@WaterlilyBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 93 + * @vftbl 92 * @symbol ?mayPlaceOn\@WaterlilyBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 113 + * @vftbl 112 * @symbol ?entityInside\@WaterlilyBlock\@\@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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 136 + * @vftbl 134 * @symbol ?getColor\@WaterlilyBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 138 + * @vftbl 136 * @symbol ?getColorAtPos\@WaterlilyBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getColorAtPos(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@WaterlilyBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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/WeakStorageEntity.hpp b/LiteLoader/include/llapi/mc/WeakStorageEntity.hpp index 15f4ebc63c..6a16939ebd 100644 --- a/LiteLoader/include/llapi/mc/WeakStorageEntity.hpp +++ b/LiteLoader/include/llapi/mc/WeakStorageEntity.hpp @@ -52,10 +52,6 @@ class WeakStorageEntity { MCAPI bool operator==(class WeakStorageEntity const &) const; //protected: - /** - * @symbol ??0WeakStorageEntity\@\@IEAA\@W4EmptyInit\@0\@\@Z - */ - MCAPI WeakStorageEntity(enum class WeakStorageEntity::EmptyInit); /** * @symbol ??0WeakStorageEntity\@\@IEAA\@AEBVStackResultStorageEntity\@\@\@Z */ @@ -65,13 +61,21 @@ class WeakStorageEntity { */ MCAPI WeakStorageEntity(class OwnerStorageEntity const &); /** - * @symbol ?_reset\@WeakStorageEntity\@\@IEAAXXZ + * @symbol ??0WeakStorageEntity\@\@IEAA\@W4VariadicInit\@0\@AEBVEntityContext\@\@\@Z */ - MCAPI void _reset(); + MCAPI WeakStorageEntity(enum class WeakStorageEntity::VariadicInit, class EntityContext const &); + /** + * @symbol ??0WeakStorageEntity\@\@IEAA\@W4EmptyInit\@0\@\@Z + */ + MCAPI WeakStorageEntity(enum class WeakStorageEntity::EmptyInit); /** - * @symbol ??1WeakStorageEntity\@\@IEAA\@XZ + * @symbol ?_isSet\@WeakStorageEntity\@\@IEBA_NXZ */ - MCAPI ~WeakStorageEntity(); + MCAPI bool _isSet() const; + /** + * @symbol ?_reset\@WeakStorageEntity\@\@IEAAXXZ + */ + MCAPI void _reset(); protected: diff --git a/LiteLoader/include/llapi/mc/WeaponItem.hpp b/LiteLoader/include/llapi/mc/WeaponItem.hpp index 38acb99b86..c0edff0552 100644 --- a/LiteLoader/include/llapi/mc/WeaponItem.hpp +++ b/LiteLoader/include/llapi/mc/WeaponItem.hpp @@ -36,11 +36,6 @@ class WeaponItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class WeaponItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 44 * @symbol ?canDestroySpecial\@WeaponItem\@\@UEBA_NAEBVBlock\@\@\@Z @@ -156,5 +156,15 @@ class WeaponItem : public Item { * @symbol ?hurtActor\@WeaponItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z */ virtual void hurtActor(class ItemStack &, class Actor &, class Mob &) const; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); }; diff --git a/LiteLoader/include/llapi/mc/WeaponItemComponent.hpp b/LiteLoader/include/llapi/mc/WeaponItemComponent.hpp index b21c4d016b..acbb84d9e0 100644 --- a/LiteLoader/include/llapi/mc/WeaponItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/WeaponItemComponent.hpp @@ -51,16 +51,11 @@ class WeaponItemComponent { virtual void __unk_vfn_3(); /** * @vftbl 4 - * @symbol __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 * @symbol ?buildNetworkTag\@?$NetworkedItemComponent\@VWeaponItemComponent\@\@\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 5 * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VWeaponItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/WearableItemComponent.hpp b/LiteLoader/include/llapi/mc/WearableItemComponent.hpp index 17560937b7..84622943e6 100644 --- a/LiteLoader/include/llapi/mc/WearableItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/WearableItemComponent.hpp @@ -51,16 +51,11 @@ class WearableItemComponent { virtual void __unk_vfn_3(); /** * @vftbl 4 - * @symbol __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 * @symbol ?buildNetworkTag\@?$NetworkedItemComponent\@VWearableItemComponent\@\@\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 + * @vftbl 5 * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VWearableItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/WebBlock.hpp b/LiteLoader/include/llapi/mc/WebBlock.hpp index 8f24922bc1..48ce9203fd 100644 --- a/LiteLoader/include/llapi/mc/WebBlock.hpp +++ b/LiteLoader/include/llapi/mc/WebBlock.hpp @@ -45,16 +45,21 @@ class WebBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class WebBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class WebBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,122 +136,117 @@ class WebBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 - */ - virtual void __unk_vfn_105(); - /** - * @vftbl 113 + * @vftbl 112 * @symbol ?entityInside\@WebBlock\@\@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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 162 + * @vftbl 160 * @symbol ?_addHardCodedBlockComponents\@WebBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 + * @vftbl 187 * @symbol ?playerDestroy\@WebBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 + * @vftbl 188 * @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/WebRTCNetworkPeer.hpp b/LiteLoader/include/llapi/mc/WebRTCNetworkPeer.hpp new file mode 100644 index 0000000000..15744f4de5 --- /dev/null +++ b/LiteLoader/include/llapi/mc/WebRTCNetworkPeer.hpp @@ -0,0 +1,83 @@ +/** + * @file WebRTCNetworkPeer.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "NetworkPeer.hpp" +#include "Bedrock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class WebRTCNetworkPeer : public NetworkPeer { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_WEBRTCNETWORKPEER +public: + class WebRTCNetworkPeer& operator=(class WebRTCNetworkPeer const &) = delete; + WebRTCNetworkPeer(class WebRTCNetworkPeer const &) = delete; + WebRTCNetworkPeer() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?sendPacket\@WebRTCNetworkPeer\@\@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); + /** + * @vftbl 2 + * @symbol ?receivePacket\@WebRTCNetworkPeer\@\@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 &); + /** + * @vftbl 3 + * @symbol ?getNetworkStatus\@WebRTCNetworkPeer\@\@UEBA?AUNetworkStatus\@NetworkPeer\@\@XZ + */ + virtual struct NetworkPeer::NetworkStatus getNetworkStatus() const; + /** + * @vftbl 4 + * @symbol ?update\@WebRTCNetworkPeer\@\@UEAAXXZ + */ + virtual void update(); + /** + * @vftbl 6 + * @symbol ?isLocal\@WebRTCNetworkPeer\@\@UEBA_NXZ + */ + virtual bool isLocal() const; + /** + * @vftbl 7 + * @symbol ?isEncrypted\@WebRTCNetworkPeer\@\@UEBA_NXZ + */ + virtual bool isEncrypted() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_WEBRTCNETWORKPEER + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~WebRTCNetworkPeer(); +#endif + /** + * @symbol ??0WebRTCNetworkPeer\@\@QEAA\@$$QEAV?$NonOwnerPointer\@UNetherNetConnector\@\@\@Bedrock\@\@_K\@Z + */ + MCAPI WebRTCNetworkPeer(class Bedrock::NonOwnerPointer &&, unsigned __int64); + +//private: + /** + * @symbol ?_updateConnectionStatus\@WebRTCNetworkPeer\@\@AEAAXXZ + */ + MCAPI void _updateConnectionStatus(); + +private: + +}; diff --git a/LiteLoader/include/llapi/mc/WeepingVinesBlock.hpp b/LiteLoader/include/llapi/mc/WeepingVinesBlock.hpp index aeadc8e09a..dd92756fdf 100644 --- a/LiteLoader/include/llapi/mc/WeepingVinesBlock.hpp +++ b/LiteLoader/include/llapi/mc/WeepingVinesBlock.hpp @@ -45,16 +45,21 @@ class WeepingVinesBlock : public BlockLegacy { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -66,10 +71,10 @@ class WeepingVinesBlock : public BlockLegacy { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -101,10 +106,10 @@ class WeepingVinesBlock : public BlockLegacy { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -131,15 +136,15 @@ class WeepingVinesBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 @@ -147,136 +152,131 @@ class WeepingVinesBlock : public BlockLegacy { virtual void __unk_vfn_60(); /** * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 * @symbol ?canContainLiquid\@WeepingVinesBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@WeepingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@WeepingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 + * @vftbl 91 * @symbol ?mayPlace\@WeepingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 98 * @symbol ?neighborChanged\@WeepingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_124(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_127(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_130(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onRemove\@WeepingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 169 + * @vftbl 167 * @symbol ?onPlace\@WeepingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 172 + * @vftbl 170 * @symbol ?tick\@WeepingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 180 + * @vftbl 178 * @symbol ?canSurvive\@WeepingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @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 02d640845a..eefa3c4378 100644 --- a/LiteLoader/include/llapi/mc/WeightedPressurePlateBlock.hpp +++ b/LiteLoader/include/llapi/mc/WeightedPressurePlateBlock.hpp @@ -40,16 +40,21 @@ class WeightedPressurePlateBlock : public BasePressurePlateBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class WeightedPressurePlateBlock : public BasePressurePlateBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class WeightedPressurePlateBlock : public BasePressurePlateBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,127 +131,122 @@ class WeightedPressurePlateBlock : public BasePressurePlateBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@WeightedPressurePlateBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 195 + * @vftbl 194 * @symbol ?getTickDelay\@WeightedPressurePlateBlock\@\@UEBAHXZ */ virtual int getTickDelay() const; /** - * @vftbl 196 + * @vftbl 195 * @symbol ?getSignalStrength\@WeightedPressurePlateBlock\@\@MEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getSignalStrength(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 197 + * @vftbl 196 * @symbol ?getSignalForData\@WeightedPressurePlateBlock\@\@MEBAHH\@Z */ virtual int getSignalForData(int) const; /** - * @vftbl 198 + * @vftbl 197 * @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 ee803ccb02..bbfac4f566 100644 --- a/LiteLoader/include/llapi/mc/Witch.hpp +++ b/LiteLoader/include/llapi/mc/Witch.hpp @@ -37,60 +37,60 @@ class Witch : public HumanoidMonster { */ virtual void __unk_vfn_16(); /** - * @vftbl 27 + * @vftbl 26 * @symbol ?getFiringPos\@Witch\@\@UEBA?AVVec3\@\@XZ */ virtual class Vec3 getFiringPos() const; /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 @@ -98,94 +98,89 @@ class Witch : public HumanoidMonster { virtual void __unk_vfn_109(); /** * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 113 * @symbol ?canAttack\@Witch\@\@UEBA_NPEAVActor\@\@_N\@Z */ virtual bool canAttack(class Actor *, bool) const; /** - * @vftbl 141 + * @vftbl 139 * @symbol ?handleEntityEvent\@Witch\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 258 + * @vftbl 250 * @symbol ?updateEntitySpecificMolangVariables\@Witch\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); + /** + * @vftbl 252 + * @symbol __unk_vfn_252 + */ + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 - */ - virtual void __unk_vfn_268(); - /** - * @vftbl 274 + * @vftbl 266 * @symbol ?_onSizeUpdated\@Witch\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 328 + * @vftbl 320 * @symbol ?getDamageAfterEnchantReduction\@Witch\@\@MEBAMAEBVActorDamageSource\@\@M\@Z */ virtual float getDamageAfterEnchantReduction(class ActorDamageSource const &, float) const; /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0Witch\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/WitherBoss.hpp b/LiteLoader/include/llapi/mc/WitherBoss.hpp index 739b0ce42d..f526fba07c 100644 --- a/LiteLoader/include/llapi/mc/WitherBoss.hpp +++ b/LiteLoader/include/llapi/mc/WitherBoss.hpp @@ -52,210 +52,205 @@ class WitherBoss : public Monster { */ virtual void remove(); /** - * @vftbl 27 + * @vftbl 26 * @symbol ?getFiringPos\@WitherBoss\@\@UEBA?AVVec3\@\@XZ */ virtual class Vec3 getFiringPos() const; /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 53 + * @vftbl 52 * @symbol ?startRiding\@WitherBoss\@\@UEAA_NAEAVActor\@\@\@Z */ virtual bool startRiding(class Actor &); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 76 + * @vftbl 74 * @symbol ?setBlockMovementSlowdownMultiplier\@WitherBoss\@\@UEAAXAEBVBlockLegacy\@\@AEBVVec3\@\@\@Z */ virtual void setBlockMovementSlowdownMultiplier(class BlockLegacy const &, class Vec3 const &); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 134 + * @vftbl 132 * @symbol ?isInvulnerableTo\@WitherBoss\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 141 + * @vftbl 139 * @symbol ?handleEntityEvent\@WitherBoss\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 171 + * @vftbl 169 * @symbol ?canFreeze\@WitherBoss\@\@UEBA_NXZ */ virtual bool canFreeze() const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 182 + * @vftbl 180 * @symbol ?causeFallDamage\@WitherBoss\@\@UEAAXMMVActorDamageSource\@\@\@Z */ virtual void causeFallDamage(float, float, class ActorDamageSource); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 207 + * @vftbl 205 * @symbol ?canBeAffected\@WitherBoss\@\@UEBA_NI\@Z */ virtual bool canBeAffected(unsigned int) const; /** - * @vftbl 208 + * @vftbl 206 * @symbol ?canBeAffectedByArrow\@WitherBoss\@\@UEBA_NAEBVMobEffectInstance\@\@\@Z */ virtual bool canBeAffectedByArrow(class MobEffectInstance const &) const; /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 245 + * @vftbl 237 * @symbol ?die\@WitherBoss\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@WitherBoss\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@WitherBoss\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@WitherBoss\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 283 + * @vftbl 275 * @symbol ?hurtEffects\@WitherBoss\@\@UEAAXAEBVActorDamageSource\@\@M_N1\@Z */ virtual void hurtEffects(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 288 + * @vftbl 280 * @symbol ?aiStep\@WitherBoss\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 310 + * @vftbl 302 * @symbol ?getArmorValue\@WitherBoss\@\@UEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 346 + * @vftbl 338 * @symbol ?newServerAiStep\@WitherBoss\@\@UEAAXXZ */ virtual void newServerAiStep(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0WitherBoss\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/WitherRoseBlock.hpp b/LiteLoader/include/llapi/mc/WitherRoseBlock.hpp index 166644fd23..fa6d5c49a1 100644 --- a/LiteLoader/include/llapi/mc/WitherRoseBlock.hpp +++ b/LiteLoader/include/llapi/mc/WitherRoseBlock.hpp @@ -40,16 +40,21 @@ class WitherRoseBlock : public FlowerBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class WitherRoseBlock : public FlowerBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class WitherRoseBlock : public FlowerBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,147 +131,142 @@ class WitherRoseBlock : public FlowerBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 86 + * @vftbl 85 * @symbol ?onFertilized\@WitherRoseBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 88 + * @vftbl 87 * @symbol ?canBeFertilized\@WitherRoseBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 93 + * @vftbl 92 * @symbol ?mayPlaceOn\@WitherRoseBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); /** - * @vftbl 113 + * @vftbl 112 * @symbol ?entityInside\@WitherRoseBlock\@\@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 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@WitherRoseBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 148 + * @vftbl 146 * @symbol ?canSpawnOn\@WitherRoseBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 152 + * @vftbl 150 * @symbol ?animateTick\@WitherRoseBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 191 + * @vftbl 190 * @symbol ?getSilkTouchItemInstance\@WitherRoseBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/WitherSkull.hpp b/LiteLoader/include/llapi/mc/WitherSkull.hpp index a574134786..f07dc8bdfc 100644 --- a/LiteLoader/include/llapi/mc/WitherSkull.hpp +++ b/LiteLoader/include/llapi/mc/WitherSkull.hpp @@ -42,140 +42,135 @@ class WitherSkull : public Fireball { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 - */ - virtual void __unk_vfn_88(); - /** - * @vftbl 95 + * @vftbl 93 * @symbol ?isPickable\@WitherSkull\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_94(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_97(); /** - * @vftbl 104 + * @vftbl 102 * @symbol ?isOnFire\@WitherSkull\@\@UEBA_NXZ */ virtual bool isOnFire() const; + /** + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 231 + * @vftbl 223 * @symbol ?canDestroyBlock\@WitherSkull\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool canDestroyBlock(class Block const &) const; /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@WitherSkull\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 276 + * @vftbl 268 * @symbol ?getInertia\@WitherSkull\@\@MEAAMXZ */ virtual float getInertia(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 269 + * @symbol __unk_vfn_269 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_269(); #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 83553a5125..267db08ec5 100644 --- a/LiteLoader/include/llapi/mc/Wolf.hpp +++ b/LiteLoader/include/llapi/mc/Wolf.hpp @@ -37,175 +37,170 @@ class Wolf : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 54 + * @vftbl 53 * @symbol ?addPassenger\@Wolf\@\@UEAAXAEAVActor\@\@\@Z */ virtual void addPassenger(class Actor &); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 120 + * @vftbl 118 * @symbol ?setSitting\@Wolf\@\@UEAAX_N\@Z */ virtual void setSitting(bool); /** - * @vftbl 133 + * @vftbl 131 * @symbol ?getAmbientSound\@Wolf\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getAmbientSound() const; /** - * @vftbl 141 + * @vftbl 139 * @symbol ?handleEntityEvent\@Wolf\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 165 + * @vftbl 163 * @symbol ?load\@Wolf\@\@UEAA_NAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual bool load(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 187 + * @vftbl 185 * @symbol ?onSynchedDataUpdate\@Wolf\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 261 + * @vftbl 253 * @symbol ?_hurt\@Wolf\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 303 + * @vftbl 295 * @symbol ?isAlliedTo\@Wolf\@\@UEAA_NPEAVMob\@\@\@Z */ virtual bool isAlliedTo(class Mob *); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 332 + * @vftbl 324 * @symbol ?onBorn\@Wolf\@\@UEAAXAEAVActor\@\@0\@Z */ virtual void onBorn(class Actor &, class Actor &); /** - * @vftbl 346 + * @vftbl 338 * @symbol ?newServerAiStep\@Wolf\@\@UEAAXXZ */ virtual void newServerAiStep(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0Wolf\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/WoodBlock.hpp b/LiteLoader/include/llapi/mc/WoodBlock.hpp index 7fd1906225..346a38441d 100644 --- a/LiteLoader/include/llapi/mc/WoodBlock.hpp +++ b/LiteLoader/include/llapi/mc/WoodBlock.hpp @@ -50,16 +50,21 @@ class WoodBlock : public RotatedPillarBlock { * @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 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -71,10 +76,10 @@ class WoodBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -106,10 +111,10 @@ class WoodBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -136,142 +141,137 @@ class WoodBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@WoodBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@WoodBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@WoodBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 178 + * @vftbl 176 * @symbol ?use\@WoodBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 186 + * @vftbl 185 * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@WoodBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @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 3ac801757a..39b3893f7e 100644 --- a/LiteLoader/include/llapi/mc/WoodButtonBlock.hpp +++ b/LiteLoader/include/llapi/mc/WoodButtonBlock.hpp @@ -40,16 +40,21 @@ class WoodButtonBlock : public ButtonBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class WoodButtonBlock : public ButtonBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class WoodButtonBlock : public ButtonBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,105 +131,100 @@ class WoodButtonBlock : public ButtonBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + virtual void __unk_vfn_59(); /** * @vftbl 60 * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_74(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_81(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_104(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_127(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_130(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_155(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** * @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 281a9d9a29..da10f2d2e2 100644 --- a/LiteLoader/include/llapi/mc/WoodSlabBlock.hpp +++ b/LiteLoader/include/llapi/mc/WoodSlabBlock.hpp @@ -40,16 +40,21 @@ class WoodSlabBlock : public SlabBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class WoodSlabBlock : public SlabBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class WoodSlabBlock : public SlabBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,142 +131,137 @@ class WoodSlabBlock : public SlabBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** * @vftbl 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 55 * @symbol ?isValidAuxValue\@WoodSlabBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; + /** + * @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 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 103 + * @vftbl 102 * @symbol ?asItemInstance\@WoodSlabBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** * @vftbl 132 - * @symbol __unk_vfn_132 - */ - virtual void __unk_vfn_132(); - /** - * @vftbl 134 * @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 135 + * @vftbl 133 * @symbol ?isAuxValueRelevantForPicking\@WoodSlabBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getVariant\@WoodSlabBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_157(); + virtual void __unk_vfn_155(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_167(); + virtual void __unk_vfn_165(); /** - * @vftbl 168 - * @symbol __unk_vfn_168 + * @vftbl 166 + * @symbol __unk_vfn_166 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_166(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_169(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_175(); + virtual void __unk_vfn_173(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** - * @vftbl 186 + * @vftbl 185 * @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 187 - * @symbol __unk_vfn_187 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_187(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 + * @vftbl 188 * @symbol ?getResourceItem\@WoodSlabBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 191 + * @vftbl 190 * @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 23e57f891f..c386bc5ba1 100644 --- a/LiteLoader/include/llapi/mc/WoodSlabBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/WoodSlabBlockItem.hpp @@ -36,11 +36,6 @@ class WoodSlabBlockItem : public DeprecatedSlabBlockItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class WoodSlabBlockItem : public DeprecatedSlabBlockItem { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 45 * @symbol ?getLevelDataForAuxValue\@WoodSlabBlockItem\@\@UEBAHH\@Z @@ -106,5 +106,15 @@ class WoodSlabBlockItem : public DeprecatedSlabBlockItem { * @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(); }; diff --git a/LiteLoader/include/llapi/mc/WoolBlock.hpp b/LiteLoader/include/llapi/mc/WoolBlock.hpp new file mode 100644 index 0000000000..175d9ea013 --- /dev/null +++ b/LiteLoader/include/llapi/mc/WoolBlock.hpp @@ -0,0 +1,238 @@ +/** + * @file WoolBlock.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "BlockLegacy.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class WoolBlock : public BlockLegacy { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_WOOLBLOCK +public: + class WoolBlock& operator=(class WoolBlock const &) = delete; + WoolBlock(class WoolBlock const &) = delete; + WoolBlock() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + 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(); + /** + * @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 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 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 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @vftbl 59 + * @symbol __unk_vfn_59 + */ + virtual void __unk_vfn_59(); + /** + * @vftbl 60 + * @symbol __unk_vfn_60 + */ + virtual void __unk_vfn_60(); + /** + * @vftbl 74 + * @symbol __unk_vfn_74 + */ + virtual void __unk_vfn_74(); + /** + * @vftbl 81 + * @symbol __unk_vfn_81 + */ + virtual void __unk_vfn_81(); + /** + * @vftbl 104 + * @symbol __unk_vfn_104 + */ + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); + /** + * @vftbl 123 + * @symbol __unk_vfn_123 + */ + virtual void __unk_vfn_123(); + /** + * @vftbl 124 + * @symbol __unk_vfn_124 + */ + virtual void __unk_vfn_124(); + /** + * @vftbl 127 + * @symbol __unk_vfn_127 + */ + virtual void __unk_vfn_127(); + /** + * @vftbl 130 + * @symbol __unk_vfn_130 + */ + virtual void __unk_vfn_130(); + /** + * @vftbl 155 + * @symbol __unk_vfn_155 + */ + virtual void __unk_vfn_155(); + /** + * @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 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_WOOLBLOCK + /** + * @symbol ?canDamperVibrations\@WoolBlock\@\@UEBA_NXZ + */ + MCVAPI bool canDamperVibrations() const; + /** + * @symbol ?canOccludeVibrations\@WoolBlock\@\@UEBA_NXZ + */ + MCVAPI bool canOccludeVibrations() const; +#endif + /** + * @symbol ??0WoolBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4BlockColor\@\@\@Z + */ + MCAPI WoolBlock(std::string const &, int, enum class BlockColor); + +}; diff --git a/LiteLoader/include/llapi/mc/ClothBlockItem.hpp b/LiteLoader/include/llapi/mc/WoolBlockItem.hpp similarity index 62% rename from LiteLoader/include/llapi/mc/ClothBlockItem.hpp rename to LiteLoader/include/llapi/mc/WoolBlockItem.hpp index 5aa6c7ccbc..4637d77f57 100644 --- a/LiteLoader/include/llapi/mc/ClothBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/WoolBlockItem.hpp @@ -1,5 +1,5 @@ /** - * @file ClothBlockItem.hpp + * @file WoolBlockItem.hpp * */ #pragma once @@ -9,25 +9,20 @@ #include "BlockItem.hpp" #define BEFORE_EXTRA -// Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC class ClothBlockItem. - * - */ -class ClothBlockItem : public BlockItem { + +class WoolBlockItem : public BlockItem { #define AFTER_EXTRA -// Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CLOTHBLOCKITEM +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_WOOLBLOCKITEM public: - class ClothBlockItem& operator=(class ClothBlockItem const &) = delete; - ClothBlockItem(class ClothBlockItem const &) = delete; - ClothBlockItem() = delete; + class WoolBlockItem& operator=(class WoolBlockItem const &) = delete; + WoolBlockItem(class WoolBlockItem const &) = delete; + WoolBlockItem() = delete; #endif public: @@ -36,11 +31,6 @@ class ClothBlockItem : public BlockItem { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -57,10 +47,10 @@ class ClothBlockItem : public BlockItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 45 - * @symbol ?getLevelDataForAuxValue\@ClothBlockItem\@\@UEBAHH\@Z + * @vftbl 19 + * @symbol __unk_vfn_19 */ - virtual int getLevelDataForAuxValue(int) const; + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -108,12 +98,22 @@ class ClothBlockItem : public BlockItem { virtual void __unk_vfn_80(); /** * @vftbl 95 - * @symbol ?buildDescriptionId\@ClothBlockItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @symbol ?buildDescriptionId\@WoolBlockItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @symbol ??0ClothBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HPEBVBlock\@\@\@Z + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @symbol ??0WoolBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z */ - MCAPI ClothBlockItem(std::string const &, int, class Block const *); + MCAPI WoolBlockItem(std::string const &, int, bool); }; diff --git a/LiteLoader/include/llapi/mc/WoolCarpetBlock.hpp b/LiteLoader/include/llapi/mc/WoolCarpetBlock.hpp index 7a1ed9ae26..ee714715bd 100644 --- a/LiteLoader/include/llapi/mc/WoolCarpetBlock.hpp +++ b/LiteLoader/include/llapi/mc/WoolCarpetBlock.hpp @@ -40,16 +40,21 @@ class WoolCarpetBlock : public CarpetBlock { * @symbol __unk_vfn_19 */ 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(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 31 + * @symbol __unk_vfn_31 */ - virtual void __unk_vfn_30(); + virtual void __unk_vfn_31(); /** * @vftbl 32 * @symbol __unk_vfn_32 @@ -61,10 +66,10 @@ class WoolCarpetBlock : public CarpetBlock { */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_34(); + virtual void __unk_vfn_35(); /** * @vftbl 36 * @symbol __unk_vfn_36 @@ -96,10 +101,10 @@ class WoolCarpetBlock : public CarpetBlock { */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 43 + * @symbol __unk_vfn_43 */ - virtual void __unk_vfn_42(); + virtual void __unk_vfn_43(); /** * @vftbl 44 * @symbol __unk_vfn_44 @@ -126,130 +131,105 @@ class WoolCarpetBlock : public CarpetBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 53 + * @symbol __unk_vfn_53 */ - virtual void __unk_vfn_49(); + virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 59 + * @symbol __unk_vfn_59 */ - virtual void __unk_vfn_54(); + 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 71 + * @vftbl 70 * @symbol ?dispense\@WoolCarpetBlock\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 74 + * @symbol __unk_vfn_74 */ - virtual void __unk_vfn_75(); + virtual void __unk_vfn_74(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 81 + * @symbol __unk_vfn_81 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_81(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_105(); + virtual void __unk_vfn_104(); + /** + * @vftbl 122 + * @symbol __unk_vfn_122 + */ + virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 124 + * @symbol __unk_vfn_124 */ - virtual void __unk_vfn_125(); + virtual void __unk_vfn_124(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 127 + * @symbol __unk_vfn_127 */ - virtual void __unk_vfn_126(); + virtual void __unk_vfn_127(); /** - * @vftbl 129 - * @symbol __unk_vfn_129 + * @vftbl 130 + * @symbol __unk_vfn_130 */ - virtual void __unk_vfn_129(); + virtual void __unk_vfn_130(); /** - * @vftbl 132 - * @symbol __unk_vfn_132 + * @vftbl 155 + * @symbol __unk_vfn_155 */ - virtual void __unk_vfn_132(); + virtual void __unk_vfn_155(); /** - * @vftbl 135 - * @symbol ?isAuxValueRelevantForPicking\@WoolCarpetBlock\@\@UEBA_NXZ + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual bool isAuxValueRelevantForPicking() const; + virtual void __unk_vfn_164(); /** - * @vftbl 157 - * @symbol __unk_vfn_157 + * @vftbl 165 + * @symbol __unk_vfn_165 */ - virtual void __unk_vfn_157(); + 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 + * @vftbl 169 + * @symbol __unk_vfn_169 */ - virtual void __unk_vfn_168(); + virtual void __unk_vfn_169(); /** - * @vftbl 171 - * @symbol __unk_vfn_171 + * @vftbl 173 + * @symbol __unk_vfn_173 */ - virtual void __unk_vfn_171(); + virtual void __unk_vfn_173(); /** - * @vftbl 175 - * @symbol __unk_vfn_175 + * @vftbl 177 + * @symbol __unk_vfn_177 */ - virtual void __unk_vfn_175(); - /** - * @vftbl 179 - * @symbol __unk_vfn_179 - */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_177(); /** * @vftbl 186 - * @symbol ?getMapColor\@WoolCarpetBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z - */ - virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; - /** - * @vftbl 187 - * @symbol __unk_vfn_187 - */ - virtual void __unk_vfn_187(); - /** - * @vftbl 189 - * @symbol ?getResourceItem\@WoolCarpetBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z - */ - virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; - /** - * @vftbl 191 - * @symbol ?getSilkTouchItemInstance\@WoolCarpetBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @symbol __unk_vfn_186 */ - virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_WOOLCARPETBLOCK /** * @symbol ?canDamperVibrations\@WoolCarpetBlock\@\@UEBA_NXZ @@ -257,8 +237,8 @@ class WoolCarpetBlock : public CarpetBlock { MCVAPI bool canDamperVibrations() const; #endif /** - * @symbol ??0WoolCarpetBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0WoolCarpetBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4BlockColor\@\@\@Z */ - MCAPI WoolCarpetBlock(std::string const &, int); + MCAPI WoolCarpetBlock(std::string const &, int, enum class BlockColor); }; diff --git a/LiteLoader/include/llapi/mc/WorldGenCache.hpp b/LiteLoader/include/llapi/mc/WorldGenCache.hpp index d9938b581e..1136dd21f3 100644 --- a/LiteLoader/include/llapi/mc/WorldGenCache.hpp +++ b/LiteLoader/include/llapi/mc/WorldGenCache.hpp @@ -29,6 +29,14 @@ class WorldGenCache { #endif public: + /** + * @symbol ??0WorldGenCache\@\@QEAA\@VChunkLocalNoiseCache\@\@VSurfaceLevelCache\@\@\@Z + */ + MCAPI WorldGenCache(class ChunkLocalNoiseCache, class SurfaceLevelCache); + /** + * @symbol ?getChunkLocalNoiseCache\@WorldGenCache\@\@QEBAAEBVChunkLocalNoiseCache\@\@XZ + */ + MCAPI class ChunkLocalNoiseCache const & getChunkLocalNoiseCache() const; /** * @symbol ??1WorldGenCache\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/WorldPackHistory.hpp b/LiteLoader/include/llapi/mc/WorldPackHistory.hpp index 0a01f6ddd6..fc71371b20 100644 --- a/LiteLoader/include/llapi/mc/WorldPackHistory.hpp +++ b/LiteLoader/include/llapi/mc/WorldPackHistory.hpp @@ -28,10 +28,6 @@ class WorldPackHistory { #endif public: - /** - * @symbol ??0WorldPackHistory\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI WorldPackHistory(class WorldPackHistory &&); /** * @symbol ??0WorldPackHistory\@\@QEAA\@AEBV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/WorldTemplateManagerProxy.hpp b/LiteLoader/include/llapi/mc/WorldTemplateManagerProxy.hpp deleted file mode 100644 index 8f02ef8b9c..0000000000 --- a/LiteLoader/include/llapi/mc/WorldTemplateManagerProxy.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file WorldTemplateManagerProxy.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class WorldTemplateManagerProxy. - * - */ -class WorldTemplateManagerProxy { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_WORLDTEMPLATEMANAGERPROXY -public: - class WorldTemplateManagerProxy& operator=(class WorldTemplateManagerProxy const &) = delete; - WorldTemplateManagerProxy(class WorldTemplateManagerProxy const &) = delete; - WorldTemplateManagerProxy() = delete; -#endif - -public: - /** - * @symbol ??0WorldTemplateManagerProxy\@\@QEAA\@AEBUWorldTemplateManagerProxyCallbacks\@\@\@Z - */ - MCAPI WorldTemplateManagerProxy(struct WorldTemplateManagerProxyCallbacks const &); - /** - * @symbol ??1WorldTemplateManagerProxy\@\@QEAA\@XZ - */ - MCAPI ~WorldTemplateManagerProxy(); - -}; diff --git a/LiteLoader/include/llapi/mc/WorldTemplateManagerProxyCallbacks.hpp b/LiteLoader/include/llapi/mc/WorldTemplateManagerProxyCallbacks.hpp index 812d3ab2aa..49c18edc42 100644 --- a/LiteLoader/include/llapi/mc/WorldTemplateManagerProxyCallbacks.hpp +++ b/LiteLoader/include/llapi/mc/WorldTemplateManagerProxyCallbacks.hpp @@ -10,19 +10,16 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure WorldTemplateManagerProxyCallbacks. - * - */ -struct WorldTemplateManagerProxyCallbacks { + +class WorldTemplateManagerProxyCallbacks { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_WORLDTEMPLATEMANAGERPROXYCALLBACKS public: - struct WorldTemplateManagerProxyCallbacks& operator=(struct WorldTemplateManagerProxyCallbacks const &) = delete; - WorldTemplateManagerProxyCallbacks(struct WorldTemplateManagerProxyCallbacks const &) = delete; + class WorldTemplateManagerProxyCallbacks& operator=(class WorldTemplateManagerProxyCallbacks const &) = delete; + WorldTemplateManagerProxyCallbacks(class WorldTemplateManagerProxyCallbacks const &) = delete; WorldTemplateManagerProxyCallbacks() = delete; #endif @@ -32,4 +29,4 @@ struct WorldTemplateManagerProxyCallbacks { */ MCAPI ~WorldTemplateManagerProxyCallbacks(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WritableBookItem.hpp b/LiteLoader/include/llapi/mc/WritableBookItem.hpp index 20aa4ec3b0..385690733f 100644 --- a/LiteLoader/include/llapi/mc/WritableBookItem.hpp +++ b/LiteLoader/include/llapi/mc/WritableBookItem.hpp @@ -36,11 +36,6 @@ class WritableBookItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class WritableBookItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -112,7 +112,17 @@ class WritableBookItem : public Item { */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @vftbl 119 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 121 * @symbol ?getInteractText\@WritableBookItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPlayer\@\@\@Z */ virtual std::string getInteractText(class Player const &) const; diff --git a/LiteLoader/include/llapi/mc/WrittenBookItem.hpp b/LiteLoader/include/llapi/mc/WrittenBookItem.hpp index ed95bbfef3..c50763dcba 100644 --- a/LiteLoader/include/llapi/mc/WrittenBookItem.hpp +++ b/LiteLoader/include/llapi/mc/WrittenBookItem.hpp @@ -36,11 +36,6 @@ class WrittenBookItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -56,6 +51,11 @@ class WrittenBookItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); /** * @vftbl 50 * @symbol ?isGlint\@WrittenBookItem\@\@MEBA_NAEBVItemStackBase\@\@\@Z @@ -127,7 +127,17 @@ class WrittenBookItem : public Item { */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 119 + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 121 * @symbol ?getInteractText\@WrittenBookItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPlayer\@\@\@Z */ virtual std::string getInteractText(class Player const &) const; diff --git a/LiteLoader/include/llapi/mc/XoroshiroPositionalRandomFactory.hpp b/LiteLoader/include/llapi/mc/XoroshiroPositionalRandomFactory.hpp index e31e0b8dd3..e345dd9954 100644 --- a/LiteLoader/include/llapi/mc/XoroshiroPositionalRandomFactory.hpp +++ b/LiteLoader/include/llapi/mc/XoroshiroPositionalRandomFactory.hpp @@ -6,7 +6,6 @@ #define AUTO_GENERATED #include "llapi/Global.h" #include "Bedrock.hpp" -#include "Crypto.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/include/llapi/mc/Zombie.hpp b/LiteLoader/include/llapi/mc/Zombie.hpp index 230e015022..3085a926a6 100644 --- a/LiteLoader/include/llapi/mc/Zombie.hpp +++ b/LiteLoader/include/llapi/mc/Zombie.hpp @@ -44,140 +44,135 @@ enum class ZombieType; */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_111(); + virtual void __unk_vfn_176(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 - */ - virtual void __unk_vfn_178(); - /** - * @vftbl 189 + * @vftbl 187 * @symbol ?canPickupItem\@Zombie\@\@UEBA_NAEBVItemStack\@\@\@Z */ virtual bool canPickupItem(class ItemStack const &) const; /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 + */ + virtual void __unk_vfn_190(); + /** + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_215(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_216(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_232(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_235(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_252(); /** * @vftbl 260 * @symbol __unk_vfn_260 */ virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_267(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 - */ - virtual void __unk_vfn_275(); - /** - * @vftbl 293 + * @vftbl 285 * @symbol ?checkSpawnRules\@Zombie\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 310 + * @vftbl 302 * @symbol ?getArmorValue\@Zombie\@\@MEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); #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 445e20e2aa..d0c636d9d3 100644 --- a/LiteLoader/include/llapi/mc/ZombieVillager.hpp +++ b/LiteLoader/include/llapi/mc/ZombieVillager.hpp @@ -42,140 +42,135 @@ class ZombieVillager : public Zombie { */ virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 40 + * @symbol __unk_vfn_40 */ - virtual void __unk_vfn_41(); + virtual void __unk_vfn_40(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 61 + * @symbol __unk_vfn_61 */ - virtual void __unk_vfn_62(); + virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 68 + * @symbol __unk_vfn_68 */ - virtual void __unk_vfn_69(); + virtual void __unk_vfn_68(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 80 + * @symbol __unk_vfn_80 */ - virtual void __unk_vfn_82(); + virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol __unk_vfn_85 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_85(); + virtual void __unk_vfn_86(); /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @vftbl 94 + * @symbol __unk_vfn_94 */ - virtual void __unk_vfn_88(); + virtual void __unk_vfn_94(); /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @vftbl 97 + * @symbol __unk_vfn_97 */ - virtual void __unk_vfn_96(); + virtual void __unk_vfn_97(); /** - * @vftbl 99 - * @symbol __unk_vfn_99 + * @vftbl 104 + * @symbol __unk_vfn_104 */ - virtual void __unk_vfn_99(); + virtual void __unk_vfn_104(); /** * @vftbl 106 * @symbol __unk_vfn_106 */ virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_108(); + virtual void __unk_vfn_107(); /** * @vftbl 109 * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol __unk_vfn_111 - */ - virtual void __unk_vfn_111(); - /** - * @vftbl 141 + * @vftbl 139 * @symbol ?handleEntityEvent\@ZombieVillager\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 176 + * @symbol __unk_vfn_176 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_176(); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @vftbl 190 + * @symbol __unk_vfn_190 */ - virtual void __unk_vfn_192(); + virtual void __unk_vfn_190(); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @vftbl 215 + * @symbol __unk_vfn_215 */ - virtual void __unk_vfn_217(); + virtual void __unk_vfn_215(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 216 + * @symbol __unk_vfn_216 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_216(); /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @vftbl 232 + * @symbol __unk_vfn_232 */ - virtual void __unk_vfn_240(); + virtual void __unk_vfn_232(); /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @vftbl 235 + * @symbol __unk_vfn_235 */ - virtual void __unk_vfn_243(); + virtual void __unk_vfn_235(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 252 + * @symbol __unk_vfn_252 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_252(); /** - * @vftbl 264 + * @vftbl 256 * @symbol ?readAdditionalSaveData\@ZombieVillager\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 265 + * @vftbl 257 * @symbol ?addAdditionalSaveData\@ZombieVillager\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_268(); + virtual void __unk_vfn_260(); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @vftbl 267 + * @symbol __unk_vfn_267 */ - virtual void __unk_vfn_275(); + virtual void __unk_vfn_267(); /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @vftbl 293 + * @symbol __unk_vfn_293 */ - virtual void __unk_vfn_301(); + virtual void __unk_vfn_293(); /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @vftbl 297 + * @symbol __unk_vfn_297 */ - virtual void __unk_vfn_305(); + virtual void __unk_vfn_297(); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_351(); + virtual void __unk_vfn_343(); /** * @symbol ??0ZombieVillager\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/utility.hpp b/LiteLoader/include/llapi/mc/utility.hpp deleted file mode 100644 index ea3c3f66ef..0000000000 --- a/LiteLoader/include/llapi/mc/utility.hpp +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file utility.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC namespace utility. - * - */ -namespace utility { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA - /** - * @symbol ?extract_fractional_second\@utility\@\@YAXAEBV?$basic_string\@_WU?$char_traits\@_W\@std\@\@V?$allocator\@_W\@2\@\@std\@\@AEAV23\@AEA_K\@Z - */ - MCAPI void extract_fractional_second(class std::basic_string, class std::allocator> const &, class std::basic_string, class std::allocator> &, unsigned __int64 &); - -}; \ No newline at end of file diff --git a/LiteLoader/src/liteloader/BuiltinBugFix.cpp b/LiteLoader/src/liteloader/BuiltinBugFix.cpp index 3d34316c4c..45dac0cccd 100644 --- a/LiteLoader/src/liteloader/BuiltinBugFix.cpp +++ b/LiteLoader/src/liteloader/BuiltinBugFix.cpp @@ -517,7 +517,7 @@ TClasslessInstanceHook(void, "?sendEvent@ActorEventCoordinator@@QEAAXAEBV?$Event #include "llapi/mc/ExtendedStreamReadResult.hpp" TInstanceHook(ExtendedStreamReadResult, - "?readExtended@PlayerListPacket@@UEAA?AUExtendedStreamReadResult@@AEAVReadOnlyBinaryStream@@@Z", + "?read@PlayerListPacket@@UEAA?AUExtendedStreamReadResult@@AEAVReadOnlyBinaryStream@@@Z", PlayerListPacket, ReadOnlyBinaryStream) { return ExtendedStreamReadResult{StreamReadResult::Valid, ""}; } diff --git a/LiteLoader/src/liteloader/BuiltinCommands.cpp b/LiteLoader/src/liteloader/BuiltinCommands.cpp index e66b08c670..69ac80d080 100644 --- a/LiteLoader/src/liteloader/BuiltinCommands.cpp +++ b/LiteLoader/src/liteloader/BuiltinCommands.cpp @@ -198,11 +198,11 @@ void LLPluginInfoCommand(CommandOutput& output, const string& pluginName) { output.trError("ll.cmd.pluginInfo.error.pluginNotFound", pluginName); } } - +// void LLVersionCommand(CommandOutput& output) { output.trSuccess("ll.cmd.version.msg", ll::getBdsVersion(), ll::getLoaderVersionString(), ll::getServerProtocolVersion()); } - +// void LLHelpCommand(CommandOutput& output) { output.trSuccess("ll.cmd.help.msg"); } @@ -330,15 +330,15 @@ class LLCommand : public Command { bool hasUpgradeOption, hasPluginNameSet, hasKeySet, hasValueSet; CommandRawText pluginNameToDoOperation; - CommandRawText key; - CommandRawText value; + std::string key; + std::string value; public: void execute(CommandOrigin const& ori, CommandOutput& output) const override { output.setLanguageCode(ori); std::string pluginName = ""; if (hasPluginNameSet) { - pluginName = pluginNameToDoOperation; + pluginName = pluginNameToDoOperation.getText(); if (pluginName.size() > 1 && pluginName[0] == '"' && pluginName[pluginName.size() - 1] == '"' && pluginName[pluginName.size() - 2] != '\\') { pluginName.erase(0, 1); pluginName.pop_back(); @@ -422,8 +422,8 @@ class LLCommand : public Command { "ll", makeMandatory(&LLCommand::operation, "Operation", "Operation_Settings").addOptions((CommandParameterOption)1), makeMandatory(&LLCommand::settingsOperation, "SettingsOperation", "SettingsOperation").addOptions((CommandParameterOption)1), - makeOptional((std::string LLCommand::*)&LLCommand::key, "JsonPointer", "A path starting with /", &LLCommand::hasKeySet), - makeOptional((std::string LLCommand::*)&LLCommand::value, "Value", "The value you'd like to set.", &LLCommand::hasValueSet)); + makeOptional((std::string LLCommand::*)&LLCommand::key, "JsonPointer", &LLCommand::hasKeySet), + makeOptional((std::string LLCommand::*)&LLCommand::value, "Value", &LLCommand::hasValueSet)); // ll load registry->addEnum("Operation_FreeFilePath", { diff --git a/LiteLoader/src/liteloader/ModifyInfomation.cpp b/LiteLoader/src/liteloader/ModifyInfomation.cpp index 2abe664a16..0cd0fa30c2 100644 --- a/LiteLoader/src/liteloader/ModifyInfomation.cpp +++ b/LiteLoader/src/liteloader/ModifyInfomation.cpp @@ -6,16 +6,25 @@ #include #include "liteloader/Config.h" #include "liteloader/Version.h" + +#include "llapi/mc/ColorFormat.hpp" +#include "llapi/mc/CommandOrigin.hpp" +#include "llapi/mc/CommandOutput.hpp" using namespace std; Logger serverLogger("Server"); extern void checkBetaVersion(); -THook(std::string, "?getServerVersionString@Common@@YA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ") { + +THook(std::string, + "?getServerVersionString@Common@@YA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ") { checkBetaVersion(); - return original() + "(ProtocolVersion " + to_string(ll::getServerProtocolVersion()) + ") with " + fmt::format(ll::globalConfig.colorLog ? fg(fmt::color::light_sky_blue) | fmt::emphasis::bold | fmt::emphasis::italic : fmt::text_style(), "LiteLoaderBDS " LITELOADER_FILE_VERSION_STRING); + return original() + "(ProtocolVersion " + to_string(ll::getServerProtocolVersion()) + ") with " + + fmt::format(ll::globalConfig.colorLog + ? fg(fmt::color::light_sky_blue) | fmt::emphasis::bold | fmt::emphasis::italic + : fmt::text_style(), + "LiteLoaderBDS " LITELOADER_FILE_VERSION_STRING); } - string& replace_all_distinct(string& str, const string& old_value, const string& new_value) { for (string::size_type pos(0); pos != string::npos; pos += new_value.length()) { if ((pos = str.find(old_value, pos)) != string::npos) @@ -25,19 +34,18 @@ string& replace_all_distinct(string& str, const string& old_value, const string& } return str; } -THook(void, "?BedrockLogOut@@YAXIPEBDZZ", - int a1, char * a2,...) -{ + +THook(void, "?BedrockLogOut@@YAXIPEBDZZ", int a1, char* a2, ...) { char Buffer[4096]; va_list va; va_start(va, a2); - auto v1 = vsprintf(Buffer,a2,va); - va_end(va); - if ( v1 < 0 ) - v1 = -1; - if ( v1 < 0 ) - return original(a1,a2,va); - string input = Buffer; + auto v1 = vsprintf(Buffer, a2, va); + va_end(va); + if (v1 < 0) + v1 = -1; + if (v1 < 0) + return original(a1, a2, va); + string input = Buffer; input.erase(std::remove(input.begin(), input.end(), '\n'), input.end()); @@ -59,107 +67,157 @@ THook(void, "?BedrockLogOut@@YAXIPEBDZZ", return; } - return original(a1,a2,va); + return original(a1, a2, va); } // Standardize BDS's output THook(void, "?PlatformBedrockLogOut@@YAXIPEBD@Z", int a1, const char* ts) { string input = ts; input.erase(std::remove(input.begin(), input.end(), '\n'), input.end()); - switch (a1) { - case 1u: - serverLogger.debug << input << Logger::endl; - break; - case 2u: - serverLogger.info << input << Logger::endl; - break; - case 4u: - serverLogger.warn << input << Logger::endl; - break; - case 8u: - serverLogger.error << input << Logger::endl; - break; - default: - serverLogger.info << input << Logger::endl; - break; + if (ll::globalConfig.colorLog) { + switch (a1) { + case 1u: + serverLogger.debug << ColorFormat::convertToConsole(input, false) << Logger::endl; + break; + case 2u: + serverLogger.info << ColorFormat::convertToConsole(input, false) << Logger::endl; + break; + case 4u: + serverLogger.warn << ColorFormat::convertToConsole(input, false) << Logger::endl; + break; + case 8u: + serverLogger.error << ColorFormat::convertToConsole(input, false) << Logger::endl; + break; + default: + serverLogger.info << ColorFormat::convertToConsole(input, false) << Logger::endl; + break; + } + } else { + switch (a1) { + case 1u: + serverLogger.debug << ColorFormat::removeColorCode(input) << Logger::endl; + break; + case 2u: + serverLogger.info << ColorFormat::removeColorCode(input) << Logger::endl; + break; + case 4u: + serverLogger.warn << ColorFormat::removeColorCode(input) << Logger::endl; + break; + case 8u: + serverLogger.error << ColorFormat::removeColorCode(input) << Logger::endl; + break; + default: + serverLogger.info << ColorFormat::removeColorCode(input) << Logger::endl; + break; + } } } // Block BDS from adding LOG metadata -THook(void, "?_appendLogEntryMetadata@LogDetails@BedrockLog@@AEAAXAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V34@W4LogAreaID@@I1HH@Z", +THook(void, + "?_appendLogEntryMetadata@LogDetails@BedrockLog@@AEAAXAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@" + "@std@@V34@W4LogAreaID@@I1HH@Z", void* a1, void* a2, void** a3, int a4, unsigned int a5, __int64 a6, unsigned int a7, unsigned int a8) { return; } #include "liteloader/LiteLoader.h" #include "llapi/mc/BedrockLog.hpp" + namespace ModifyInfomation { int telemetryText = 0; } + +std::mutex mtx; +std::string cmdstr; + THook(void, "?log@BedrockLog@@YAXW4LogCategory@1@V?$bitset@$02@std@@W4LogRule@1@W4LogAreaID@@IPEBDH4ZZ", - enum BedrockLog::LogCategory a1, class std::bitset<3> a2, enum BedrockLog::LogRule a3, enum LogAreaID a4, unsigned int a5, char const* a6, int a7, char const* a8, ...) { + enum BedrockLog::LogCategory a1, class std::bitset<3> a2, enum BedrockLog::LogRule a3, enum LogAreaID a4, + unsigned int a5, char const* a6, int a7, char const* a8, ...) { va_list va; auto text = (char*)a8; va_start(va, a8); if (string(text).find("= TELEMETRY MESSAGE =") != string(text).npos) { ModifyInfomation::telemetryText = 6; - return BedrockLog::log_va(a1, a2, a3, a4, a5, a6, a7, "To enable Server Telemetry, add the line 'emit-server-telemetry=true' to the server.properties file in the bds directory", va); + return BedrockLog::log_va(a1, a2, a3, a4, a5, a6, a7, + "To enable Server Telemetry, add the line 'emit-server-telemetry=true' to the " + "server.properties file in the bds directory", + va); } if (ModifyInfomation::telemetryText > 0) { ModifyInfomation::telemetryText--; return; } + // CommandOutputSender send + if (a7 == 50 || a7 == 53) { + + va_start(va, a8); - if (string(text).find("setting up server logging...") != string(text).npos || string(text).find("Server started") != string(text).npos) { + va_arg(va, __int64); + auto returnvalue = va_arg(va, __int64); + std::string input = (char*)returnvalue; + cmdstr = input; + + va_end(va); + return; + } + + if (string(text).find("setting up server logging...") != string(text).npos || + string(text).find("Server started") != string(text).npos) { return; } return BedrockLog::log_va(a1, a2, a3, a4, a5, a6, a7, a8, va); } -#include "llapi/mc/ColorFormat.hpp" -#include "llapi/mc/CommandOrigin.hpp" -#include "llapi/mc/CommandOutput.hpp" +#include "llapi/utils/StringHelper.h" extern std::unordered_map resultOfOrigin; + TClasslessInstanceHook(void*, "?send@CommandOutputSender@@UEAAXAEBVCommandOrigin@@AEBVCommandOutput@@@Z", class CommandOrigin const& origin, class CommandOutput const& output) { - std::stringbuf tmpBuf; - auto oldBuf = std::cout.rdbuf(); - std::cout.rdbuf(&tmpBuf); + + auto rv = original(this, origin, output); - std::cout.rdbuf(oldBuf); - if (ll::isDebugMode() && ll::globalRuntimeConfig.tickThreadId != std::this_thread::get_id()) { - ll::logger.warn("The thread executing the CommandOutputSender::send is not the \"MC_SERVER\" thread"); - ll::logger.warn("Output: {}", tmpBuf.str()); - } + if (origin.getOriginType() == (CommandOriginType)7) { + std::string str = cmdstr.c_str(); - auto it = resultOfOrigin.find(&origin); - if (it != resultOfOrigin.end()) { - try { - // May crash for incomprehensible reasons - it->second->assign(tmpBuf.str()); - while (it->second->size() && (it->second->back() == '\n' || it->second->back() == '\r')) - it->second->pop_back(); - it->second = nullptr; - resultOfOrigin.erase(it); - return rv; - } catch (...) { - if (ll::isDebugMode()) { - ll::logger.warn("Output: {}", tmpBuf.str()); - ll::logger.warn("size of resultOfOrigin: {}", resultOfOrigin.size()); - } + if (ll::isDebugMode() && ll::globalRuntimeConfig.tickThreadId != std::this_thread::get_id()) { + ll::logger.warn("The thread executing the CommandOutputSender::send is not the \"MC_SERVER\" thread"); + ll::logger.warn("Output: {}", str); + } + + auto it = resultOfOrigin.find(&origin); + if (it != resultOfOrigin.end()) { + try { + // May crash for incomprehensible reasons + it->second->assign(str); + while (it->second->size() && (it->second->back() == '\n' || it->second->back() == '\r')) + it->second->pop_back(); + it->second = nullptr; + resultOfOrigin.erase(it); + return rv; + } catch (...) { + if (ll::isDebugMode()) { + ll::logger.warn("Output: {}", str); + ll::logger.warn("size of resultOfOrigin: {}", resultOfOrigin.size()); + } #ifdef DEBUG - __debugbreak(); + __debugbreak(); #endif // DEBUG + } + } + + auto& log = output.getSuccessCount() > 0 ? serverLogger.info : serverLogger.error; + std::vector ts = SplitStrWithPattern(str, "\n"); + if (!ts.empty()) { + ts.pop_back(); + for (auto s : ts) { + if (ll::globalConfig.colorLog) { + log << ColorFormat::convertToConsole(s, false) << Logger::endl; + } else { + log << ColorFormat::removeColorCode(s) << Logger::endl; + } + } } - } - auto& log = output.getSuccessCount() > 0 ? serverLogger.info : serverLogger.error; - std::istringstream iss(tmpBuf.str()); - string line; - while (getline(iss, line)) { - if (ll::globalConfig.colorLog) - log << ColorFormat::convertToConsole(line, false) << Logger::endl; - else - log << ColorFormat::removeColorCode(line) << Logger::endl; } return rv; -} +} \ No newline at end of file diff --git a/LiteLoader/src/llapi/EventAPI.cpp b/LiteLoader/src/llapi/EventAPI.cpp index 9d3e9bd2ee..cfd0e8ef01 100644 --- a/LiteLoader/src/llapi/EventAPI.cpp +++ b/LiteLoader/src/llapi/EventAPI.cpp @@ -1356,22 +1356,21 @@ TInstanceHook(bool, "?destroyBlock@SurvivalMode@@UEAA_NAEBVBlockPos@@E@Z", GameM return original(this, blockPos, uChar); } -TInstanceHook(bool, "?_creativeDestroyBlock@GameMode@@AEAA_NAEBVBlockPos@@E@Z", GameMode, BlockPos blockPos, - unsigned __int8 uChar) { - IF_LISTENED(PlayerDestroyBlockEvent) { - auto player = getPlayer(); - if (player && player->isPlayer()) { +TInstanceHook(bool, "?destroyBlock@GameMode@@UEAA_NAEBVBlockPos@@E@Z", GameMode, BlockPos a3, unsigned __int8 a4) { + auto player = getPlayer(); + if (player != nullptr && player->isPlayer()) { + IF_LISTENED(PlayerDestroyBlockEvent) { PlayerDestroyBlockEvent ev{}; ev.mPlayer = player; - auto blockInstance = Level::getBlockInstance(blockPos, player->getDimensionId()); - ev.mBlockInstance = blockInstance; + auto bl = Level::getBlockInstance(a3, player->getDimensionId()); + ev.mBlockInstance = bl; if (!ev.call()) { return false; } } + IF_LISTENED_END(PlayerDestroyBlockEvent) } - IF_LISTENED_END(PlayerDestroyBlockEvent) - return original(this, blockPos, uChar); + return original(this, a3, a4); } /////////////////// PlayerUseItemOn /////////////////// diff --git a/LiteLoader/src/llapi/mc/ItemActorAPI.cpp b/LiteLoader/src/llapi/mc/ItemActorAPI.cpp index a26450d188..1899017d6f 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 8a4b5ed385..eef26700f7 100644 --- a/LiteLoader/src/llapi/mc/LevelAPI.cpp +++ b/LiteLoader/src/llapi/mc/LevelAPI.cpp @@ -150,7 +150,7 @@ Container* Level::getContainer(Vec3 pos, int dim) { // `RandomizableBlockActorContainerBase'} // This function didn't use 'this' pointer - return ((DropperBlockActor*)nullptr)->_getContainerAt(*Level::getBlockSource(dim), pos); + return ((DropperBlockActor*)nullptr)->getContainerAt(*Level::getBlockSource(dim), pos); } Actor* Level::getDamageSourceEntity(ActorDamageSource* ads) { diff --git a/LiteLoader/src/llapi/mc/PlayerAPI.cpp b/LiteLoader/src/llapi/mc/PlayerAPI.cpp index 3fd25e5c42..c7d25b8de4 100644 --- a/LiteLoader/src/llapi/mc/PlayerAPI.cpp +++ b/LiteLoader/src/llapi/mc/PlayerAPI.cpp @@ -330,7 +330,7 @@ bool Player::runcmd(const string& cmd) { } Container* Player::getEnderChestContainer() { - return dAccess(this, 3264); // IDA Player::Player() 782 + return dAccess(this, 3344); // IDA Player::Player() 782 } bool Player::transferServer(const string& address, unsigned short port) { diff --git a/LiteLoader/src/llapi/mc/StaticVanillaBlocksAPI.cpp b/LiteLoader/src/llapi/mc/StaticVanillaBlocksAPI.cpp index 6e6cb5b51a..b97af394a6 100644 --- a/LiteLoader/src/llapi/mc/StaticVanillaBlocksAPI.cpp +++ b/LiteLoader/src/llapi/mc/StaticVanillaBlocksAPI.cpp @@ -78,6 +78,7 @@ Block const* mBirchTrapdoor; Block const* mBirchWallSign; Block const* mBlackCandle; Block const* mBlackCandleCake; +Block const* mBlackCarpet; Block const* mBlackGlazedTerracotta; Block const* mBlackWool; Block const* mBlackstone; @@ -88,22 +89,26 @@ Block const* mBlackstoneWall; Block const* mBlastFurnace; Block const* mBlueCandle; Block const* mBlueCandleCake; +Block const* mBlueCarpet; Block const* mBlueGlazedTerracotta; Block const* mBlueIce; Block const* mBlueWool; Block const* mBoneBlock; Block const* mBookshelf; Block const* mBorderBlock; +Block const* mBrainCoral; Block const* mBrewingStand; Block const* mBrickBlock; Block const* mBrickStairs; Block const* mBrownCandle; Block const* mBrownCandleCake; +Block const* mBrownCarpet; Block const* mBrownGlazedTerracotta; Block const* mBrownMushroom; Block const* mBrownMushroomBlock; Block const* mBrownWool; Block const* mBubbleColumn; +Block const* mBubbleCoral; Block const* mBuddingAmethyst; Block const* mCactus; Block const* mCake; @@ -113,7 +118,6 @@ Block const* mCamera; Block const* mCampFire; Block const* mCandle; Block const* mCandleCake; -Block const* mCarpet; Block const* mCarrots; Block const* mCartographyTable; Block const* mCarvedPumpkin; @@ -171,7 +175,6 @@ Block const* mConcretePowder; Block const* mConduit; Block const* mCopperBlock; Block const* mCopperOre; -Block const* mCoral; Block const* mCoralBlock; Block const* mCoralFan; Block const* mCoralFanDead; @@ -207,6 +210,7 @@ Block const* mCutCopperSlab; Block const* mCutCopperStairs; Block const* mCyanCandle; Block const* mCyanCandleCake; +Block const* mCyanCarpet; Block const* mCyanGlazedTerracotta; Block const* mCyanWool; Block const* mDarkOakButton; @@ -223,6 +227,11 @@ Block const* mDarkoakStandingSign; Block const* mDarkoakWallSign; Block const* mDaylightDetector; Block const* mDaylightDetectorInverted; +Block const* mDeadBrainCoral; +Block const* mDeadBubbleCoral; +Block const* mDeadFireCoral; +Block const* mDeadHornCoral; +Block const* mDeadTubeCoral; Block const* mDeadbush; Block const* mDecoratedPot; Block const* mDeepslate; @@ -282,6 +291,7 @@ Block const* mExposedDoubleCutCopperSlab; Block const* mFarmlandBlock; Block const* mFenceGate; Block const* mFire; +Block const* mFireCoral; Block const* mFletchingTable; Block const* mFlowerPot; Block const* mFloweringAzalea; @@ -306,10 +316,12 @@ Block const* mGrassPath; Block const* mGravel; Block const* mGrayCandle; Block const* mGrayCandleCake; +Block const* mGrayCarpet; Block const* mGrayGlazedTerracotta; Block const* mGrayWool; Block const* mGreenCandle; Block const* mGreenCandleCake; +Block const* mGreenCarpet; Block const* mGreenGlazedTerracotta; Block const* mGreenWool; Block const* mGrindstone; @@ -324,6 +336,7 @@ Block const* mHeavyWeightedPressurePlate; Block const* mHoneyBlock; Block const* mHoneycombBlock; Block const* mHopper; +Block const* mHornCoral; Block const* mIce; Block const* mInfestedDeepslate; Block const* mInfoUpdate; @@ -355,7 +368,6 @@ Block const* mLapisBlock; Block const* mLapisOre; Block const* mLargeAmethystBud; Block const* mLava; -Block const* mLavaCauldron; Block const* mLeaves; Block const* mLeaves2; Block const* mLectern; @@ -363,15 +375,18 @@ Block const* mLever; Block const* mLightBlock; Block const* mLightBlueCandle; Block const* mLightBlueCandleCake; +Block const* mLightBlueCarpet; Block const* mLightBlueGlazedTerracotta; Block const* mLightBlueWool; Block const* mLightGrayCandle; Block const* mLightGrayCandleCake; +Block const* mLightGrayCarpet; Block const* mLightGrayWool; Block const* mLightWeightedPressurePlate; Block const* mLightningRod; Block const* mLimeCandle; Block const* mLimeCandleCake; +Block const* mLimeCarpet; Block const* mLimeGlazedTerracotta; Block const* mLimeWool; Block const* mLitBlastFurnace; @@ -385,6 +400,7 @@ Block const* mLodestone; Block const* mLoom; Block const* mMagentaCandle; Block const* mMagentaCandleCake; +Block const* mMagentaCarpet; Block const* mMagentaGlazedTerracotta; Block const* mMagentaWool; Block const* mMagma; @@ -448,6 +464,7 @@ Block const* mObsidian; Block const* mOchreFroglight; Block const* mOrangeCandle; Block const* mOrangeCandleCake; +Block const* mOrangeCarpet; Block const* mOrangeGlazedTerracotta; Block const* mOrangeWool; Block const* mOxidizedCopper; @@ -460,11 +477,14 @@ Block const* mPackedMud; Block const* mPearlescentFroglight; Block const* mPinkCandle; Block const* mPinkCandleCake; +Block const* mPinkCarpet; Block const* mPinkGlazedTerracotta; Block const* mPinkPetals; Block const* mPinkWool; Block const* mPiston; Block const* mPistonArmCollision; +Block const* mPitcherCrop; +Block const* mPitcherPlant; Block const* mPlanks; Block const* mPodzol; Block const* mPointedDripstone; @@ -501,6 +521,7 @@ Block const* mPumpkin; Block const* mPumpkinStem; Block const* mPurpleCandle; Block const* mPurpleCandleCake; +Block const* mPurpleCarpet; Block const* mPurpleGlazedTerracotta; Block const* mPurpleWool; Block const* mPurpurBlock; @@ -515,6 +536,7 @@ Block const* mRawGoldBlock; Block const* mRawIronBlock; Block const* mRedCandle; Block const* mRedCandleCake; +Block const* mRedCarpet; Block const* mRedFlower; Block const* mRedGlazedTerracotta; Block const* mRedMushroom; @@ -561,6 +583,7 @@ Block const* mSmoothQuartzStairs; Block const* mSmoothRedSandstoneStairs; Block const* mSmoothSandstoneStairs; Block const* mSmoothStone; +Block const* mSnifferEgg; Block const* mSnow; Block const* mSnowLayer; Block const* mSoulCampfire; @@ -632,6 +655,7 @@ Block const* mTrapdoor; Block const* mTrappedChest; Block const* mTripWire; Block const* mTripWireHook; +Block const* mTubeCoral; Block const* mTuff; Block const* mTurtleEgg; Block const* mTwistingVines; @@ -695,6 +719,7 @@ Block const* mWeepingVines; Block const* mWheat; Block const* mWhiteCandle; Block const* mWhiteCandleCake; +Block const* mWhiteCarpet; Block const* mWhiteGlazedTerracotta; Block const* mWhiteWool; Block const* mWitherRose; @@ -705,766 +730,737 @@ Block const* mWoodenPressurePlate; Block const* mWoodenSlab; Block const* mYellowCandle; Block const* mYellowCandleCake; +Block const* mYellowCarpet; Block const* mYellowFlower; Block const* mYellowGlazedTerracotta; Block const* mYellowWool; +#define INIT_BLOCK(x) m##x = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::x, true) + void assignBlocks() { for (int i = 0; i < 119; ++i) { - mElements[i] = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Elements[i], true); + INIT_BLOCK(Elements[i]); } - mAcaciaButton = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AcaciaButton, true); - mAcaciaDoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AcaciaDoor, true); - mAcaciaFence = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AcaciaFence, true); - mAcaciaFenceGate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AcaciaFenceGate, true); - mAcaciaHangingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AcaciaHangingSign, true); - mAcaciaLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AcaciaLog, true); - mAcaciaPressurePlate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AcaciaPressurePlate, true); - mAcaciaStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AcaciaStairs, true); - mAcaciaStandingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AcaciaStandingSign, true); - mAcaciaTrapdoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AcaciaTrapdoor, true); - mAcaciaWallSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AcaciaWallSign, true); - mActivatorRail = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ActivatorRail, true); - mAllow = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Allow, true); - mAmethystBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AmethystBlock, true); - mAmethystCluster = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AmethystCluster, true); - mAncientDebris = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AncientDebris, true); - mAndesiteStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AndesiteStairs, true); - mAnvil = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Anvil, true); - mAzalea = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Azalea, true); - mAzaleaLeaves = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AzaleaLeaves, true); - mAzaleaLeavesFlowered = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AzaleaLeavesFlowered, true); - mBamboo = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Bamboo, true); - mBambooBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BambooBlock, true); - mBambooButton = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BambooButton, true); - mBambooDoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BambooDoor, true); - mBambooDoubleSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BambooDoubleSlab, true); - mBambooFence = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BambooFence, true); - mBambooFenceGate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BambooFenceGate, true); - mBambooHangingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BambooHangingSign, true); - mBambooMosaic = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BambooMosaic, true); - mBambooMosaicDoubleSlab = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BambooMosaicDoubleSlab, true); - mBambooMosaicSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BambooMosaicSlab, true); - mBambooMosaicStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BambooMosaicStairs, true); - mBambooPlanks = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BambooPlanks, true); - mBambooPressurePlate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BambooPressurePlate, true); - mBambooSapling = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BambooSapling, true); - mBambooSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BambooSlab, true); - mBambooStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BambooStairs, true); - mBambooStandingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BambooStandingSign, true); - mBambooTrapdoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BambooTrapdoor, true); - mBambooWallSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BambooWallSign, true); - mBarrel = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Barrel, true); - mBarrier = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Barrier, true); - mBasalt = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Basalt, true); - mBeacon = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Beacon, true); - mBed = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Bed, true); - mBedrock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Bedrock, true); - mBeeNest = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BeeNest, true); - mBeehive = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Beehive, true); - mBeetroot = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Beetroot, true); - mBell = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Bell, true); - mBigDripleaf = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BigDripleaf, true); - mBirchButton = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BirchButton, true); - mBirchDoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BirchDoor, true); - mBirchFence = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BirchFence, true); - mBirchFenceGate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BirchFenceGate, true); - mBirchHangingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BirchHangingSign, true); - mBirchLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BirchLog, true); - mBirchPressurePlate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BirchPressurePlate, true); - mBirchStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BirchStairs, true); - mBirchStandingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BirchStandingSign, true); - mBirchTrapdoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BirchTrapdoor, true); - mBirchWallSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BirchWallSign, true); - mBlackCandle = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BlackCandle, true); - mBlackCandleCake = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BlackCandleCake, true); - mBlackGlazedTerracotta = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BlackGlazedTerracotta, true); - mBlackWool = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BlackWool, true); - mBlackstone = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Blackstone, true); - mBlackstoneDoubleSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BlackstoneDoubleSlab, true); - mBlackstoneSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BlackstoneSlab, true); - mBlackstoneStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BlackstoneStairs, true); - mBlackstoneWall = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BlackstoneWall, true); - mBlastFurnace = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BlastFurnace, true); - mBlueCandle = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BlueCandle, true); - mBlueCandleCake = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BlueCandleCake, true); - mBlueGlazedTerracotta = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BlueGlazedTerracotta, true); - mBlueIce = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BlueIce, true); - mBlueWool = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BlueWool, true); - mBoneBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BoneBlock, true); - mBookshelf = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Bookshelf, true); - mBorderBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BorderBlock, true); - mBrewingStand = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BrewingStand, true); - mBrickBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BrickBlock, true); - mBrickStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BrickStairs, true); - mBrownCandle = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BrownCandle, true); - mBrownCandleCake = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BrownCandleCake, true); - mBrownGlazedTerracotta = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BrownGlazedTerracotta, true); - mBrownMushroom = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BrownMushroom, true); - mBrownMushroomBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BrownMushroomBlock, true); - mBrownWool = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BrownWool, true); - mBubbleColumn = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BubbleColumn, true); - mBuddingAmethyst = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BuddingAmethyst, true); - mCactus = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Cactus, true); - mCake = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Cake, true); - mCalcite = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Calcite, true); - mCalibratedSculkSensor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CalibratedSculkSensor, true); - mCamera = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Camera, true); - mCampFire = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CampFire, true); - mCandle = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Candle, true); - mCandleCake = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CandleCake, true); - mCarpet = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Carpet, true); - mCarrots = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Carrots, true); - mCartographyTable = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CartographyTable, true); - mCarvedPumpkin = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CarvedPumpkin, true); - mCauldron = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Cauldron, true); - mCaveVines = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CaveVines, true); - mCaveVinesBodyWithBerries = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CaveVinesBodyWithBerries, true); - mCaveVinesHeadWithBerries = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CaveVinesHeadWithBerries, true); - mChain = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Chain, true); - mChainCommandBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ChainCommandBlock, true); - mChalkboard = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Chalkboard, true); - mChemicalHeat = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ChemicalHeat, true); - mChemistryTable = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ChemistryTable, true); - mCherryButton = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryButton, true); - mCherryDoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryDoor, true); - mCherryDoubleSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryDoubleSlab, true); - mCherryFence = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryFence, true); - mCherryFenceGate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryFenceGate, true); - mCherryHangingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryHangingSign, true); - mCherryLeaves = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryLeaves, true); - mCherryLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryLog, true); - mCherryPlanks = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryPlanks, true); - mCherryPressurePlate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryPressurePlate, true); - mCherrySapling = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherrySapling, true); - mCherrySlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherrySlab, true); - mCherryStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryStairs, true); - mCherryStandingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryStandingSign, true); - mCherryTrapdoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryTrapdoor, true); - mCherryWallSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryWallSign, true); - mCherryWood = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryWood, true); - mChest = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Chest, true); - mChiseledBookshelf = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ChiseledBookshelf, true); - mChiseledDeepslate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ChiseledDeepslate, true); - mChiseledNetherBricks = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ChiseledNetherBricks, true); - mChiseledPolishedBlackstone = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ChiseledPolishedBlackstone, true); - mChorusFlower = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ChorusFlower, true); - mChorusPlant = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ChorusPlant, true); - mClay = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Clay, true); - mClientRequestPlaceholderBlock = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ClientRequestPlaceholderBlock, true); - mCoalBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CoalBlock, true); - mCoalOre = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CoalOre, true); - mCobbledDeepslate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CobbledDeepslate, true); - mCobbledDeepslateDoubleSlab = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CobbledDeepslateDoubleSlab, true); - mCobbledDeepslateSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CobbledDeepslateSlab, true); - mCobbledDeepslateStairs = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CobbledDeepslateStairs, true); - mCobbledDeepslateWall = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CobbledDeepslateWall, true); - mCobblestone = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Cobblestone, true); - mCobblestoneWall = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CobblestoneWall, true); - mCocoa = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Cocoa, true); - mColoredTorchBp = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ColoredTorchBp, true); - mColoredTorchRg = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ColoredTorchRg, true); - mCommandBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CommandBlock, true); - mComposter = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Composter, true); - mConcrete = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Concrete, true); - mConcretePowder = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ConcretePowder, true); - mConduit = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Conduit, true); - mCopperBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CopperBlock, true); - mCopperOre = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CopperOre, true); - mCoral = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Coral, true); - mCoralBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CoralBlock, true); - mCoralFan = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CoralFan, true); - mCoralFanDead = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CoralFanDead, true); - mCoralFanHang = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CoralFanHang, true); - mCoralFanHang2 = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CoralFanHang2, true); - mCoralFanHang3 = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CoralFanHang3, true); - mCrackedDeepslateBricks = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CrackedDeepslateBricks, true); - mCrackedDeepslateTiles = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CrackedDeepslateTiles, true); - mCrackedNetherBricks = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CrackedNetherBricks, true); - mCrackedPolishedBlackstoneBricks = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CrackedPolishedBlackstoneBricks, true); - mCraftingTable = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CraftingTable, true); - mCrimsonButton = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CrimsonButton, true); - mCrimsonDoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CrimsonDoor, true); - mCrimsonDoubleSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CrimsonDoubleSlab, true); - mCrimsonFence = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CrimsonFence, true); - mCrimsonFenceGate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CrimsonFenceGate, true); - mCrimsonFungus = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CrimsonFungus, true); - mCrimsonHangingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CrimsonHangingSign, true); - mCrimsonHyphae = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CrimsonHyphae, true); - mCrimsonNylium = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CrimsonNylium, true); - mCrimsonPlanks = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CrimsonPlanks, true); - mCrimsonPressurePlate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CrimsonPressurePlate, true); - mCrimsonRoots = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CrimsonRoots, true); - mCrimsonSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CrimsonSlab, true); - mCrimsonStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CrimsonStairs, true); - mCrimsonStandingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CrimsonStandingSign, true); - mCrimsonStem = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CrimsonStem, true); - mCrimsonTrapdoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CrimsonTrapdoor, true); - mCrimsonWallSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CrimsonWallSign, true); - mCryingObsidian = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CryingObsidian, true); - mCutCopper = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CutCopper, true); - mCutCopperSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CutCopperSlab, true); - mCutCopperStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CutCopperStairs, true); - mCyanCandle = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CyanCandle, true); - mCyanCandleCake = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CyanCandleCake, true); - mCyanGlazedTerracotta = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CyanGlazedTerracotta, true); - mCyanWool = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CyanWool, true); - mDarkOakButton = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DarkOakButton, true); - mDarkOakDoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DarkOakDoor, true); - mDarkOakFence = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DarkOakFence, true); - mDarkOakFenceGate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DarkOakFenceGate, true); - mDarkOakLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DarkOakLog, true); - mDarkOakPressurePlate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DarkOakPressurePlate, true); - mDarkOakStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DarkOakStairs, true); - mDarkOakTrapdoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DarkOakTrapdoor, true); - mDarkPrismarineStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DarkPrismarineStairs, true); - mDarkoakHangingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DarkoakHangingSign, true); - mDarkoakStandingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DarkoakStandingSign, true); - mDarkoakWallSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DarkoakWallSign, true); - mDaylightDetector = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DaylightDetector, true); - mDaylightDetectorInverted = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DaylightDetectorInverted, true); - mDeadbush = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Deadbush, true); - mDecoratedPot = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DecoratedPot, true); - mDeepslate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Deepslate, true); - mDeepslateBrickDoubleSlab = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DeepslateBrickDoubleSlab, true); - mDeepslateBrickSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DeepslateBrickSlab, true); - mDeepslateBrickStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DeepslateBrickStairs, true); - mDeepslateBrickWall = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DeepslateBrickWall, true); - mDeepslateBricks = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DeepslateBricks, true); - mDeepslateCoalOre = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DeepslateCoalOre, true); - mDeepslateCopperOre = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DeepslateCopperOre, true); - mDeepslateDiamondOre = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DeepslateDiamondOre, true); - mDeepslateEmeraldOre = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DeepslateEmeraldOre, true); - mDeepslateGoldOre = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DeepslateGoldOre, true); - mDeepslateIronOre = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DeepslateIronOre, true); - mDeepslateLapisOre = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DeepslateLapisOre, true); - mDeepslateRedstoneOre = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DeepslateRedstoneOre, true); - mDeepslateTileDoubleSlab = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DeepslateTileDoubleSlab, true); - mDeepslateTileSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DeepslateTileSlab, true); - mDeepslateTileStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DeepslateTileStairs, true); - mDeepslateTileWall = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DeepslateTileWall, true); - mDeepslateTiles = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DeepslateTiles, true); - mDeny = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Deny, true); - mDetectorRail = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DetectorRail, true); - mDiamondBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DiamondBlock, true); - mDiamondOre = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DiamondOre, true); - mDioriteStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DioriteStairs, true); - mDirt = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Dirt, true); - mDirtWithRoots = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DirtWithRoots, true); - mDispenser = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Dispenser, true); - mDoubleCutCopperSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DoubleCutCopperSlab, true); - mDoublePlant = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DoublePlant, true); - mDoubleStoneSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DoubleStoneSlab, true); - mDoubleStoneSlab2 = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DoubleStoneSlab2, true); - mDoubleStoneSlab3 = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DoubleStoneSlab3, true); - mDoubleStoneSlab4 = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DoubleStoneSlab4, true); - mDoubleWoodenSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DoubleWoodenSlab, true); - mDragonEgg = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DragonEgg, true); - mDriedKelpBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DriedKelpBlock, true); - mDripstone = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Dripstone, true); - mDropper = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Dropper, true); - mEmeraldBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::EmeraldBlock, true); - mEmeraldOre = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::EmeraldOre, true); - mEnchantingTable = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::EnchantingTable, true); - mEndBrickStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::EndBrickStairs, true); - mEndBricks = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::EndBricks, true); - mEndGateway = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::EndGateway, true); - mEndPortal = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::EndPortal, true); - mEndPortalFrame = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::EndPortalFrame, true); - mEndRod = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::EndRod, true); - mEndStone = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::EndStone, true); - mEnderChest = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::EnderChest, true); - mExposedCopper = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ExposedCopper, true); - mExposedCutCopper = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ExposedCutCopper, true); - mExposedCutCopperSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ExposedCutCopperSlab, true); - mExposedCutCopperStairs = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ExposedCutCopperStairs, true); - mExposedDoubleCutCopperSlab = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ExposedDoubleCutCopperSlab, true); - mFarmlandBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::FarmlandBlock, true); - mFenceGate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::FenceGate, true); - mFire = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Fire, true); - mFletchingTable = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::FletchingTable, true); - mFlowerPot = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::FlowerPot, true); - mFloweringAzalea = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::FloweringAzalea, true); - mFlowingLava = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::FlowingLava, true); - mFlowingWater = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::FlowingWater, true); - mFrogSpawn = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::FrogSpawn, true); - mFrostedIce = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::FrostedIce, true); - mFurnace = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Furnace, true); - mGildedBlackstone = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::GildedBlackstone, true); - mGlass = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Glass, true); - mGlassPane = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::GlassPane, true); - mGlowItemFrame = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::GlowItemFrame, true); - mGlowLichen = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::GlowLichen, true); - mGlowingObsidian = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::GlowingObsidian, true); - mGlowstone = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Glowstone, true); - mGoldBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::GoldBlock, true); - mGoldOre = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::GoldOre, true); - mGoldenRail = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::GoldenRail, true); - mGraniteStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::GraniteStairs, true); - mGrass = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Grass, true); - mGrassPath = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::GrassPath, true); - mGravel = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Gravel, true); - mGrayCandle = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::GrayCandle, true); - mGrayCandleCake = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::GrayCandleCake, true); - mGrayGlazedTerracotta = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::GrayGlazedTerracotta, true); - mGrayWool = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::GrayWool, true); - mGreenCandle = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::GreenCandle, true); - mGreenCandleCake = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::GreenCandleCake, true); - mGreenGlazedTerracotta = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::GreenGlazedTerracotta, true); - mGreenWool = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::GreenWool, true); - mGrindstone = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Grindstone, true); - mHangingRoots = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::HangingRoots, true); - mHardGlass = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::HardGlass, true); - mHardGlassPane = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::HardGlassPane, true); - mHardStainedGlass = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::HardStainedGlass, true); - mHardStainedGlassPane = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::HardStainedGlassPane, true); - mHardenedClay = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::HardenedClay, true); - mHayBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::HayBlock, true); - mHeavyWeightedPressurePlate = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::HeavyWeightedPressurePlate, true); - mHoneyBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::HoneyBlock, true); - mHoneycombBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::HoneycombBlock, true); - mHopper = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Hopper, true); - mIce = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Ice, true); - mInfestedDeepslate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::InfestedDeepslate, true); - mInfoUpdate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::InfoUpdate, true); - mInfoUpdate2 = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::InfoUpdate2, true); - mInvisibleBedrock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::InvisibleBedrock, true); - mIronBars = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::IronBars, true); - mIronBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::IronBlock, true); - mIronDoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::IronDoor, true); - mIronOre = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::IronOre, true); - mIronTrapdoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::IronTrapdoor, true); - mItemFrame = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ItemFrame, true); - mJigsaw = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Jigsaw, true); - mJukebox = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Jukebox, true); - mJungleButton = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::JungleButton, true); - mJungleDoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::JungleDoor, true); - mJungleFence = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::JungleFence, true); - mJungleFenceGate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::JungleFenceGate, true); - mJungleHangingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::JungleHangingSign, true); - mJungleLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::JungleLog, true); - mJunglePressurePlate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::JunglePressurePlate, true); - mJungleStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::JungleStairs, true); - mJungleStandingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::JungleStandingSign, true); - mJungleTrapdoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::JungleTrapdoor, true); - mJungleWallSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::JungleWallSign, true); - mKelp = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Kelp, true); - mLadder = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Ladder, true); - mLantern = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Lantern, true); - mLapisBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::LapisBlock, true); - mLapisOre = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::LapisOre, true); - mLargeAmethystBud = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::LargeAmethystBud, true); - mLava = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Lava, true); - mLavaCauldron = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::LavaCauldron, true); - mLeaves = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Leaves, true); - mLeaves2 = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Leaves2, true); - mLectern = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Lectern, true); - mLever = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Lever, true); - mLightBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::LightBlock, true); - mLightBlueCandle = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::LightBlueCandle, true); - mLightBlueCandleCake = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::LightBlueCandleCake, true); - mLightBlueGlazedTerracotta = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::LightBlueGlazedTerracotta, true); - mLightBlueWool = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::LightBlueWool, true); - mLightGrayCandle = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::LightGrayCandle, true); - mLightGrayCandleCake = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::LightGrayCandleCake, true); - mLightGrayWool = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::LightGrayWool, true); - mLightWeightedPressurePlate = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::LightWeightedPressurePlate, true); - mLightningRod = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::LightningRod, true); - mLimeCandle = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::LimeCandle, true); - mLimeCandleCake = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::LimeCandleCake, true); - mLimeGlazedTerracotta = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::LimeGlazedTerracotta, true); - mLimeWool = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::LimeWool, true); - mLitBlastFurnace = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::LitBlastFurnace, true); - mLitDeepslateRedstoneOre = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::LitDeepslateRedstoneOre, true); - mLitFurnace = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::LitFurnace, true); - mLitPumpkin = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::LitPumpkin, true); - mLitRedstoneLamp = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::LitRedstoneLamp, true); - mLitRedstoneOre = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::LitRedstoneOre, true); - mLitSmoker = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::LitSmoker, true); - mLodestone = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Lodestone, true); - mLoom = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Loom, true); - mMagentaCandle = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MagentaCandle, true); - mMagentaCandleCake = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MagentaCandleCake, true); - mMagentaGlazedTerracotta = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MagentaGlazedTerracotta, true); - mMagentaWool = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MagentaWool, true); - mMagma = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Magma, true); - mMangroveButton = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MangroveButton, true); - mMangroveDoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MangroveDoor, true); - mMangroveDoubleSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MangroveDoubleSlab, true); - mMangroveFence = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MangroveFence, true); - mMangroveFenceGate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MangroveFenceGate, true); - mMangroveHangingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MangroveHangingSign, true); - mMangroveLeaves = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MangroveLeaves, true); - mMangroveLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MangroveLog, true); - mMangrovePlanks = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MangrovePlanks, true); - mMangrovePressurePlate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MangrovePressurePlate, true); - mMangrovePropagule = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MangrovePropagule, true); - mMangroveRoots = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MangroveRoots, true); - mMangroveSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MangroveSlab, true); - mMangroveStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MangroveStairs, true); - mMangroveStandingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MangroveStandingSign, true); - mMangroveTrapdoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MangroveTrapdoor, true); - mMangroveWallSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MangroveWallSign, true); - mMangroveWood = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MangroveWood, true); - mMediumAmethystBud = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MediumAmethystBud, true); - mMelonBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MelonBlock, true); - mMelonStem = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MelonStem, true); - mMobSpawner = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MobSpawner, true); - mMonsterEgg = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MonsterEgg, true); - mMossBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MossBlock, true); - mMossCarpet = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MossCarpet, true); - mMossyCobblestone = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MossyCobblestone, true); - mMossyCobblestoneStairs = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MossyCobblestoneStairs, true); - mMossyStoneBrickStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MossyStoneBrickStairs, true); - mMovingBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MovingBlock, true); - mMud = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Mud, true); - mMudBrickDoubleSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MudBrickDoubleSlab, true); - mMudBrickSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MudBrickSlab, true); - mMudBrickStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MudBrickStairs, true); - mMudBrickWall = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MudBrickWall, true); - mMudBricks = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MudBricks, true); - mMuddyMangroveRoots = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MuddyMangroveRoots, true); - mMycelium = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Mycelium, true); - mMysteriousFrame = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MysteriousFrame, true); - mMysteriousFrameSlot = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MysteriousFrameSlot, true); - mNetherBrickBlockName = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::NetherBrickBlockName, true); - mNetherBrickFence = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::NetherBrickFence, true); - mNetherBrickStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::NetherBrickStairs, true); - mNetherGoldOre = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::NetherGoldOre, true); - mNetherSprouts = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::NetherSprouts, true); - mNetherWart = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::NetherWart, true); - mNetherWartBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::NetherWartBlock, true); - mNetheriteBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::NetheriteBlock, true); - mNetherrack = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Netherrack, true); - mNetherreactor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Netherreactor, true); - mNormalStoneStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::NormalStoneStairs, true); - mNoteblock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Noteblock, true); - mOakFence = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::OakFence, true); - mOakHangingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::OakHangingSign, true); - mOakLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::OakLog, true); - mOakStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::OakStairs, true); - mObserver = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Observer, true); - mObsidian = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Obsidian, true); - mOchreFroglight = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::OchreFroglight, true); - mOrangeCandle = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::OrangeCandle, true); - mOrangeCandleCake = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::OrangeCandleCake, true); - mOrangeGlazedTerracotta = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::OrangeGlazedTerracotta, true); - mOrangeWool = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::OrangeWool, true); - mOxidizedCopper = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::OxidizedCopper, true); - mOxidizedCutCopper = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::OxidizedCutCopper, true); - mOxidizedCutCopperSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::OxidizedCutCopperSlab, true); - mOxidizedCutCopperStairs = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::OxidizedCutCopperStairs, true); - mOxidizedDoubleCutCopperSlab = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::OxidizedDoubleCutCopperSlab, true); - mPackedIce = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PackedIce, true); - mPackedMud = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PackedMud, true); - mPearlescentFroglight = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PearlescentFroglight, true); - mPinkCandle = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PinkCandle, true); - mPinkCandleCake = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PinkCandleCake, true); - mPinkGlazedTerracotta = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PinkGlazedTerracotta, true); - mPinkPetals = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PinkPetals, true); - mPinkWool = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PinkWool, true); - mPiston = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Piston, true); - mPistonArmCollision = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PistonArmCollision, true); - mPlanks = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Planks, true); - mPodzol = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Podzol, true); - mPointedDripstone = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PointedDripstone, true); - mPolishedAndesiteStairs = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PolishedAndesiteStairs, true); - mPolishedBasalt = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PolishedBasalt, true); - mPolishedBlackstone = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PolishedBlackstone, true); - mPolishedBlackstoneBrickDoubleSlab = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PolishedBlackstoneBrickDoubleSlab, true); - mPolishedBlackstoneBrickSlab = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PolishedBlackstoneBrickSlab, true); - mPolishedBlackstoneBrickStairs = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PolishedBlackstoneBrickStairs, true); - mPolishedBlackstoneBrickWall = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PolishedBlackstoneBrickWall, true); - mPolishedBlackstoneBricks = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PolishedBlackstoneBricks, true); - mPolishedBlackstoneButton = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PolishedBlackstoneButton, true); - mPolishedBlackstoneDoubleSlab = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PolishedBlackstoneDoubleSlab, true); - mPolishedBlackstonePressurePlate = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PolishedBlackstonePressurePlate, true); - mPolishedBlackstoneSlab = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PolishedBlackstoneSlab, true); - mPolishedBlackstoneStairs = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PolishedBlackstoneStairs, true); - mPolishedBlackstoneWall = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PolishedBlackstoneWall, true); - mPolishedDeepslate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PolishedDeepslate, true); - mPolishedDeepslateDoubleSlab = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PolishedDeepslateDoubleSlab, true); - mPolishedDeepslateSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PolishedDeepslateSlab, true); - mPolishedDeepslateStairs = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PolishedDeepslateStairs, true); - mPolishedDeepslateWall = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PolishedDeepslateWall, true); - mPolishedDioriteStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PolishedDioriteStairs, true); - mPolishedGraniteStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PolishedGraniteStairs, true); - mPortal = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Portal, true); - mPotatoes = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Potatoes, true); - mPowderSnow = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PowderSnow, true); - mPoweredComparator = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PoweredComparator, true); - mPoweredRepeater = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PoweredRepeater, true); - mPrismarine = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Prismarine, true); - mPrismarineBricksStairs = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PrismarineBricksStairs, true); - mPrismarineStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PrismarineStairs, true); - mPumpkin = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Pumpkin, true); - mPumpkinStem = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PumpkinStem, true); - mPurpleCandle = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PurpleCandle, true); - mPurpleCandleCake = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PurpleCandleCake, true); - mPurpleGlazedTerracotta = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PurpleGlazedTerracotta, true); - mPurpleWool = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PurpleWool, true); - mPurpurBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PurpurBlock, true); - mPurpurStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PurpurStairs, true); - mQuartzBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::QuartzBlock, true); - mQuartzBricks = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::QuartzBricks, true); - mQuartzOre = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::QuartzOre, true); - mQuartzStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::QuartzStairs, true); - mRail = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Rail, true); - mRawCopperBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::RawCopperBlock, true); - mRawGoldBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::RawGoldBlock, true); - mRawIronBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::RawIronBlock, true); - mRedCandle = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::RedCandle, true); - mRedCandleCake = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::RedCandleCake, true); - mRedFlower = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::RedFlower, true); - mRedGlazedTerracotta = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::RedGlazedTerracotta, true); - mRedMushroom = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::RedMushroom, true); - mRedMushroomBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::RedMushroomBlock, true); - mRedNetherBrick = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::RedNetherBrick, true); - mRedNetherBrickStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::RedNetherBrickStairs, true); - mRedSandstone = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::RedSandstone, true); - mRedSandstoneStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::RedSandstoneStairs, true); - mRedWool = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::RedWool, true); - mRedstoneBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::RedstoneBlock, true); - mRedstoneLamp = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::RedstoneLamp, true); - mRedstoneOre = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::RedstoneOre, true); - mRedstoneTorch = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::RedstoneTorch, true); - mRedstoneWire = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::RedstoneWire, true); - mReeds = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Reeds, true); - mReinforcedDeepslate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ReinforcedDeepslate, true); - mRepeatingCommandBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::RepeatingCommandBlock, true); - mReserved6 = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Reserved6, true); - mRespawnAnchor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::RespawnAnchor, true); - mSand = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Sand, true); - mSandstone = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Sandstone, true); - mSandstoneStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SandstoneStairs, true); - mSapling = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Sapling, true); - mScaffolding = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Scaffolding, true); - mSculk = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Sculk, true); - mSculkCatalyst = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SculkCatalyst, true); - mSculkSensor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SculkSensor, true); - mSculkShrieker = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SculkShrieker, true); - mSculkVein = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SculkVein, true); - mSeaLantern = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SeaLantern, true); - mSeaPickle = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SeaPickle, true); - mSeagrass = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Seagrass, true); - mShroomlight = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Shroomlight, true); - mShulkerBox = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ShulkerBox, true); - mSilverGlazedTerracotta = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SilverGlazedTerracotta, true); - mSkull = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Skull, true); - mSlimeBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SlimeBlock, true); - mSmallAmethystBud = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SmallAmethystBud, true); - mSmallDripleaf = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SmallDripleaf, true); - mSmithingTable = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SmithingTable, true); - mSmoker = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Smoker, true); - mSmoothBasalt = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SmoothBasalt, true); - mSmoothQuartzStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SmoothQuartzStairs, true); - mSmoothRedSandstoneStairs = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SmoothRedSandstoneStairs, true); - mSmoothSandstoneStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SmoothSandstoneStairs, true); - mSmoothStone = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SmoothStone, true); - mSnow = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Snow, true); - mSnowLayer = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SnowLayer, true); - mSoulCampfire = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SoulCampfire, true); - mSoulFire = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SoulFire, true); - mSoulLantern = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SoulLantern, true); - mSoulSand = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SoulSand, true); - mSoulSoil = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SoulSoil, true); - mSoulTorch = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SoulTorch, true); - mSponge = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Sponge, true); - mSporeBlossom = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SporeBlossom, true); - mSpruceButton = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SpruceButton, true); - mSpruceDoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SpruceDoor, true); - mSpruceFence = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SpruceFence, true); - mSpruceFenceGate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SpruceFenceGate, true); - mSpruceHangingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SpruceHangingSign, true); - mSpruceLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SpruceLog, true); - mSprucePressurePlate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SprucePressurePlate, true); - mSpruceStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SpruceStairs, true); - mSpruceStandingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SpruceStandingSign, true); - mSpruceTrapdoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SpruceTrapdoor, true); - mSpruceWallSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SpruceWallSign, true); - mStainedGlass = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StainedGlass, true); - mStainedGlassPane = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StainedGlassPane, true); - mStainedHardenedClay = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StainedHardenedClay, true); - mStandingBanner = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StandingBanner, true); - mStandingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StandingSign, true); - mStickyPiston = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StickyPiston, true); - mStickyPistonArmCollision = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StickyPistonArmCollision, true); - mStone = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Stone, true); - mStoneBrickStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StoneBrickStairs, true); - mStoneBricks = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StoneBricks, true); - mStoneButton = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StoneButton, true); - mStonePressurePlate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StonePressurePlate, true); - mStoneSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StoneSlab, true); - mStoneSlab2 = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StoneSlab2, true); - mStoneSlab3 = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StoneSlab3, true); - mStoneSlab4 = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StoneSlab4, true); - mStoneStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StoneStairs, true); - mStonecutter = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Stonecutter, true); - mStonecutterBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StonecutterBlock, true); - mStrippedAcaciaLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StrippedAcaciaLog, true); - mStrippedBambooBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StrippedBambooBlock, true); - mStrippedBirchLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StrippedBirchLog, true); - mStrippedCherryLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StrippedCherryLog, true); - mStrippedCherryWood = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StrippedCherryWood, true); - mStrippedCrimsonHyphae = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StrippedCrimsonHyphae, true); - mStrippedCrimsonStem = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StrippedCrimsonStem, true); - mStrippedDarkOakLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StrippedDarkOakLog, true); - mStrippedJungleLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StrippedJungleLog, true); - mStrippedMangroveLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StrippedMangroveLog, true); - mStrippedMangroveWood = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StrippedMangroveWood, true); - mStrippedOakLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StrippedOakLog, true); - mStrippedSpruceLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StrippedSpruceLog, true); - mStrippedWarpedHyphae = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StrippedWarpedHyphae, true); - mStrippedWarpedStem = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StrippedWarpedStem, true); - mStructureBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StructureBlock, true); - mStructureVoid = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StructureVoid, true); - mSuspiciousGravel = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SuspiciousGravel, true); - mSuspiciousSand = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SuspiciousSand, true); - mSweetBerryBush = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SweetBerryBush, true); - mTallGrass = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::TallGrass, true); - mTarget = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Target, true); - mTintedGlass = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::TintedGlass, true); - mTnt = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Tnt, true); - mTorch = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Torch, true); - mTorchflower = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Torchflower, true); - mTorchflowerCrop = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::TorchflowerCrop, true); - mTrapdoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Trapdoor, true); - mTrappedChest = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::TrappedChest, true); - mTripWire = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::TripWire, true); - mTripWireHook = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::TripWireHook, true); - mTuff = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Tuff, true); - mTurtleEgg = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::TurtleEgg, true); - mTwistingVines = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::TwistingVines, true); - mUnderwaterTorch = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::UnderwaterTorch, true); - mUndyedShulkerBox = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::UndyedShulkerBox, true); - mUnlitRedstoneTorch = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::UnlitRedstoneTorch, true); - mUnpoweredComparator = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::UnpoweredComparator, true); - mUnpoweredRepeater = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::UnpoweredRepeater, true); - mVerdantFroglight = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::VerdantFroglight, true); - mVine = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Vine, true); - mWallBanner = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WallBanner, true); - mWallSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WallSign, true); - mWarpedButton = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WarpedButton, true); - mWarpedDoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WarpedDoor, true); - mWarpedDoubleSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WarpedDoubleSlab, true); - mWarpedFence = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WarpedFence, true); - mWarpedFenceGate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WarpedFenceGate, true); - mWarpedFungus = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WarpedFungus, true); - mWarpedHangingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WarpedHangingSign, true); - mWarpedHyphae = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WarpedHyphae, true); - mWarpedNylium = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WarpedNylium, true); - mWarpedPlanks = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WarpedPlanks, true); - mWarpedPressurePlate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WarpedPressurePlate, true); - mWarpedRoots = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WarpedRoots, true); - mWarpedSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WarpedSlab, true); - mWarpedStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WarpedStairs, true); - mWarpedStandingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WarpedStandingSign, true); - mWarpedStem = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WarpedStem, true); - mWarpedTrapdoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WarpedTrapdoor, true); - mWarpedWallSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WarpedWallSign, true); - mWarpedWartBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WarpedWartBlock, true); - mWater = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Water, true); - mWaterLily = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WaterLily, true); - mWaxedCopper = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WaxedCopper, true); - mWaxedCutCopper = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WaxedCutCopper, true); - mWaxedCutCopperSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WaxedCutCopperSlab, true); - mWaxedCutCopperStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WaxedCutCopperStairs, true); - mWaxedDoubleCutCopperSlab = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WaxedDoubleCutCopperSlab, true); - mWaxedExposedCopper = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WaxedExposedCopper, true); - mWaxedExposedCutCopper = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WaxedExposedCutCopper, true); - mWaxedExposedCutCopperSlab = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WaxedExposedCutCopperSlab, true); - mWaxedExposedCutCopperStairs = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WaxedExposedCutCopperStairs, true); - mWaxedExposedDoubleCutCopperSlab = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WaxedExposedDoubleCutCopperSlab, true); - mWaxedOxidizedCopper = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WaxedOxidizedCopper, true); - mWaxedOxidizedCutCopper = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WaxedOxidizedCutCopper, true); - mWaxedOxidizedCutCopperSlab = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WaxedOxidizedCutCopperSlab, true); - mWaxedOxidizedCutCopperStairs = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WaxedOxidizedCutCopperStairs, true); - mWaxedOxidizedDoubleCutCopperSlab = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WaxedOxidizedDoubleCutCopperSlab, true); - mWaxedWeatheredCopper = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WaxedWeatheredCopper, true); - mWaxedWeatheredCutCopper = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WaxedWeatheredCutCopper, true); - mWaxedWeatheredCutCopperSlab = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WaxedWeatheredCutCopperSlab, true); - mWaxedWeatheredCutCopperStairs = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WaxedWeatheredCutCopperStairs, true); - mWaxedWeatheredDoubleCutCopperSlab = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WaxedWeatheredDoubleCutCopperSlab, true); - mWeatheredCopper = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WeatheredCopper, true); - mWeatheredCutCopper = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WeatheredCutCopper, true); - mWeatheredCutCopperSlab = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WeatheredCutCopperSlab, true); - mWeatheredCutCopperStairs = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WeatheredCutCopperStairs, true); - mWeatheredDoubleCutCopperSlab = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WeatheredDoubleCutCopperSlab, true); - mWeb = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Web, true); - mWeepingVines = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WeepingVines, true); - mWheat = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Wheat, true); - mWhiteCandle = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WhiteCandle, true); - mWhiteCandleCake = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WhiteCandleCake, true); - mWhiteGlazedTerracotta = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WhiteGlazedTerracotta, true); - mWhiteWool = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WhiteWool, true); - mWitherRose = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WitherRose, true); - mWood = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Wood, true); - mWoodenButton = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WoodenButton, true); - mWoodenDoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WoodenDoor, true); - mWoodenPressurePlate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WoodenPressurePlate, true); - mWoodenSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::WoodenSlab, true); - mYellowCandle = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::YellowCandle, true); - mYellowCandleCake = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::YellowCandleCake, true); - mYellowFlower = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::YellowFlower, true); - mYellowGlazedTerracotta = - &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::YellowGlazedTerracotta, true); - mYellowWool = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::YellowWool, true); + INIT_BLOCK(AcaciaButton); + INIT_BLOCK(AcaciaDoor); + INIT_BLOCK(AcaciaFence); + INIT_BLOCK(AcaciaFenceGate); + INIT_BLOCK(AcaciaHangingSign); + INIT_BLOCK(AcaciaLog); + INIT_BLOCK(AcaciaPressurePlate); + INIT_BLOCK(AcaciaStairs); + INIT_BLOCK(AcaciaStandingSign); + INIT_BLOCK(AcaciaTrapdoor); + INIT_BLOCK(AcaciaWallSign); + INIT_BLOCK(ActivatorRail); + INIT_BLOCK(Allow); + INIT_BLOCK(AmethystBlock); + INIT_BLOCK(AmethystCluster); + INIT_BLOCK(AncientDebris); + INIT_BLOCK(AndesiteStairs); + INIT_BLOCK(Anvil); + INIT_BLOCK(Azalea); + INIT_BLOCK(AzaleaLeaves); + INIT_BLOCK(AzaleaLeavesFlowered); + INIT_BLOCK(Bamboo); + INIT_BLOCK(BambooBlock); + INIT_BLOCK(BambooButton); + INIT_BLOCK(BambooDoor); + INIT_BLOCK(BambooDoubleSlab); + INIT_BLOCK(BambooFence); + INIT_BLOCK(BambooFenceGate); + INIT_BLOCK(BambooHangingSign); + INIT_BLOCK(BambooMosaic); + INIT_BLOCK(BambooMosaicDoubleSlab); + INIT_BLOCK(BambooMosaicSlab); + INIT_BLOCK(BambooMosaicStairs); + INIT_BLOCK(BambooPlanks); + INIT_BLOCK(BambooPressurePlate); + INIT_BLOCK(BambooSapling); + INIT_BLOCK(BambooSlab); + INIT_BLOCK(BambooStairs); + INIT_BLOCK(BambooStandingSign); + INIT_BLOCK(BambooTrapdoor); + INIT_BLOCK(BambooWallSign); + INIT_BLOCK(Barrel); + INIT_BLOCK(Barrier); + INIT_BLOCK(Basalt); + INIT_BLOCK(Beacon); + INIT_BLOCK(Bed); + INIT_BLOCK(Bedrock); + INIT_BLOCK(BeeNest); + INIT_BLOCK(Beehive); + INIT_BLOCK(Beetroot); + INIT_BLOCK(Bell); + INIT_BLOCK(BigDripleaf); + INIT_BLOCK(BirchButton); + INIT_BLOCK(BirchDoor); + INIT_BLOCK(BirchFence); + INIT_BLOCK(BirchFenceGate); + INIT_BLOCK(BirchHangingSign); + INIT_BLOCK(BirchLog); + INIT_BLOCK(BirchPressurePlate); + INIT_BLOCK(BirchStairs); + INIT_BLOCK(BirchStandingSign); + INIT_BLOCK(BirchTrapdoor); + INIT_BLOCK(BirchWallSign); + INIT_BLOCK(BlackCandle); + INIT_BLOCK(BlackCandleCake); + INIT_BLOCK(BlackCarpet); + INIT_BLOCK(BlackGlazedTerracotta); + INIT_BLOCK(BlackWool); + INIT_BLOCK(Blackstone); + INIT_BLOCK(BlackstoneDoubleSlab); + INIT_BLOCK(BlackstoneSlab); + INIT_BLOCK(BlackstoneStairs); + INIT_BLOCK(BlackstoneWall); + INIT_BLOCK(BlastFurnace); + INIT_BLOCK(BlueCandle); + INIT_BLOCK(BlueCandleCake); + INIT_BLOCK(BlueCarpet); + INIT_BLOCK(BlueGlazedTerracotta); + INIT_BLOCK(BlueIce); + INIT_BLOCK(BlueWool); + INIT_BLOCK(BoneBlock); + INIT_BLOCK(Bookshelf); + INIT_BLOCK(BorderBlock); + INIT_BLOCK(BrainCoral); + INIT_BLOCK(BrewingStand); + INIT_BLOCK(BrickBlock); + INIT_BLOCK(BrickStairs); + INIT_BLOCK(BrownCandle); + INIT_BLOCK(BrownCandleCake); + INIT_BLOCK(BrownCarpet); + INIT_BLOCK(BrownGlazedTerracotta); + INIT_BLOCK(BrownMushroom); + INIT_BLOCK(BrownMushroomBlock); + INIT_BLOCK(BrownWool); + INIT_BLOCK(BubbleColumn); + INIT_BLOCK(BubbleCoral); + INIT_BLOCK(BuddingAmethyst); + INIT_BLOCK(Cactus); + INIT_BLOCK(Cake); + INIT_BLOCK(Calcite); + INIT_BLOCK(CalibratedSculkSensor); + INIT_BLOCK(Camera); + INIT_BLOCK(CampFire); + INIT_BLOCK(Candle); + INIT_BLOCK(CandleCake); + INIT_BLOCK(Carrots); + INIT_BLOCK(CartographyTable); + INIT_BLOCK(CarvedPumpkin); + INIT_BLOCK(Cauldron); + INIT_BLOCK(CaveVines); + INIT_BLOCK(CaveVinesBodyWithBerries); + INIT_BLOCK(CaveVinesHeadWithBerries); + INIT_BLOCK(Chain); + INIT_BLOCK(ChainCommandBlock); + INIT_BLOCK(Chalkboard); + INIT_BLOCK(ChemicalHeat); + INIT_BLOCK(ChemistryTable); + INIT_BLOCK(CherryButton); + INIT_BLOCK(CherryDoor); + INIT_BLOCK(CherryDoubleSlab); + INIT_BLOCK(CherryFence); + INIT_BLOCK(CherryFenceGate); + INIT_BLOCK(CherryHangingSign); + INIT_BLOCK(CherryLeaves); + INIT_BLOCK(CherryLog); + INIT_BLOCK(CherryPlanks); + INIT_BLOCK(CherryPressurePlate); + INIT_BLOCK(CherrySapling); + INIT_BLOCK(CherrySlab); + INIT_BLOCK(CherryStairs); + INIT_BLOCK(CherryStandingSign); + INIT_BLOCK(CherryTrapdoor); + INIT_BLOCK(CherryWallSign); + INIT_BLOCK(CherryWood); + INIT_BLOCK(Chest); + INIT_BLOCK(ChiseledBookshelf); + INIT_BLOCK(ChiseledDeepslate); + INIT_BLOCK(ChiseledNetherBricks); + INIT_BLOCK(ChiseledPolishedBlackstone); + INIT_BLOCK(ChorusFlower); + INIT_BLOCK(ChorusPlant); + INIT_BLOCK(Clay); + INIT_BLOCK(ClientRequestPlaceholderBlock); + INIT_BLOCK(CoalBlock); + INIT_BLOCK(CoalOre); + INIT_BLOCK(CobbledDeepslate); + INIT_BLOCK(CobbledDeepslateDoubleSlab); + INIT_BLOCK(CobbledDeepslateSlab); + INIT_BLOCK(CobbledDeepslateStairs); + INIT_BLOCK(CobbledDeepslateWall); + INIT_BLOCK(Cobblestone); + INIT_BLOCK(CobblestoneWall); + INIT_BLOCK(Cocoa); + INIT_BLOCK(ColoredTorchBp); + INIT_BLOCK(ColoredTorchRg); + INIT_BLOCK(CommandBlock); + INIT_BLOCK(Composter); + INIT_BLOCK(Concrete); + INIT_BLOCK(ConcretePowder); + INIT_BLOCK(Conduit); + INIT_BLOCK(CopperBlock); + INIT_BLOCK(CopperOre); + INIT_BLOCK(CoralBlock); + INIT_BLOCK(CoralFan); + INIT_BLOCK(CoralFanDead); + INIT_BLOCK(CoralFanHang); + INIT_BLOCK(CoralFanHang2); + INIT_BLOCK(CoralFanHang3); + INIT_BLOCK(CrackedDeepslateBricks); + INIT_BLOCK(CrackedDeepslateTiles); + INIT_BLOCK(CrackedNetherBricks); + INIT_BLOCK(CrackedPolishedBlackstoneBricks); + INIT_BLOCK(CraftingTable); + INIT_BLOCK(CrimsonButton); + INIT_BLOCK(CrimsonDoor); + INIT_BLOCK(CrimsonDoubleSlab); + INIT_BLOCK(CrimsonFence); + INIT_BLOCK(CrimsonFenceGate); + INIT_BLOCK(CrimsonFungus); + INIT_BLOCK(CrimsonHangingSign); + INIT_BLOCK(CrimsonHyphae); + INIT_BLOCK(CrimsonNylium); + INIT_BLOCK(CrimsonPlanks); + INIT_BLOCK(CrimsonPressurePlate); + INIT_BLOCK(CrimsonRoots); + INIT_BLOCK(CrimsonSlab); + INIT_BLOCK(CrimsonStairs); + INIT_BLOCK(CrimsonStandingSign); + INIT_BLOCK(CrimsonStem); + INIT_BLOCK(CrimsonTrapdoor); + INIT_BLOCK(CrimsonWallSign); + INIT_BLOCK(CryingObsidian); + INIT_BLOCK(CutCopper); + INIT_BLOCK(CutCopperSlab); + INIT_BLOCK(CutCopperStairs); + INIT_BLOCK(CyanCandle); + INIT_BLOCK(CyanCandleCake); + INIT_BLOCK(CyanCarpet); + INIT_BLOCK(CyanGlazedTerracotta); + INIT_BLOCK(CyanWool); + INIT_BLOCK(DarkOakButton); + INIT_BLOCK(DarkOakDoor); + INIT_BLOCK(DarkOakFence); + INIT_BLOCK(DarkOakFenceGate); + INIT_BLOCK(DarkOakLog); + INIT_BLOCK(DarkOakPressurePlate); + INIT_BLOCK(DarkOakStairs); + INIT_BLOCK(DarkOakTrapdoor); + INIT_BLOCK(DarkPrismarineStairs); + INIT_BLOCK(DarkoakHangingSign); + INIT_BLOCK(DarkoakStandingSign); + INIT_BLOCK(DarkoakWallSign); + INIT_BLOCK(DaylightDetector); + INIT_BLOCK(DaylightDetectorInverted); + INIT_BLOCK(DeadBrainCoral); + INIT_BLOCK(DeadBubbleCoral); + INIT_BLOCK(DeadFireCoral); + INIT_BLOCK(DeadHornCoral); + INIT_BLOCK(DeadTubeCoral); + INIT_BLOCK(Deadbush); + INIT_BLOCK(DecoratedPot); + INIT_BLOCK(Deepslate); + INIT_BLOCK(DeepslateBrickDoubleSlab); + INIT_BLOCK(DeepslateBrickSlab); + INIT_BLOCK(DeepslateBrickStairs); + INIT_BLOCK(DeepslateBrickWall); + INIT_BLOCK(DeepslateBricks); + INIT_BLOCK(DeepslateCoalOre); + INIT_BLOCK(DeepslateCopperOre); + INIT_BLOCK(DeepslateDiamondOre); + INIT_BLOCK(DeepslateEmeraldOre); + INIT_BLOCK(DeepslateGoldOre); + INIT_BLOCK(DeepslateIronOre); + INIT_BLOCK(DeepslateLapisOre); + INIT_BLOCK(DeepslateRedstoneOre); + INIT_BLOCK(DeepslateTileDoubleSlab); + INIT_BLOCK(DeepslateTileSlab); + INIT_BLOCK(DeepslateTileStairs); + INIT_BLOCK(DeepslateTileWall); + INIT_BLOCK(DeepslateTiles); + INIT_BLOCK(Deny); + INIT_BLOCK(DetectorRail); + INIT_BLOCK(DiamondBlock); + INIT_BLOCK(DiamondOre); + INIT_BLOCK(DioriteStairs); + INIT_BLOCK(Dirt); + INIT_BLOCK(DirtWithRoots); + INIT_BLOCK(Dispenser); + INIT_BLOCK(DoubleCutCopperSlab); + INIT_BLOCK(DoublePlant); + INIT_BLOCK(DoubleStoneSlab); + INIT_BLOCK(DoubleStoneSlab2); + INIT_BLOCK(DoubleStoneSlab3); + INIT_BLOCK(DoubleStoneSlab4); + INIT_BLOCK(DoubleWoodenSlab); + INIT_BLOCK(DragonEgg); + INIT_BLOCK(DriedKelpBlock); + INIT_BLOCK(Dripstone); + INIT_BLOCK(Dropper); + INIT_BLOCK(EmeraldBlock); + INIT_BLOCK(EmeraldOre); + INIT_BLOCK(EnchantingTable); + INIT_BLOCK(EndBrickStairs); + INIT_BLOCK(EndBricks); + INIT_BLOCK(EndGateway); + INIT_BLOCK(EndPortal); + INIT_BLOCK(EndPortalFrame); + INIT_BLOCK(EndRod); + INIT_BLOCK(EndStone); + INIT_BLOCK(EnderChest); + INIT_BLOCK(ExposedCopper); + INIT_BLOCK(ExposedCutCopper); + INIT_BLOCK(ExposedCutCopperSlab); + INIT_BLOCK(ExposedCutCopperStairs); + INIT_BLOCK(ExposedDoubleCutCopperSlab); + INIT_BLOCK(FarmlandBlock); + INIT_BLOCK(FenceGate); + INIT_BLOCK(Fire); + INIT_BLOCK(FireCoral); + INIT_BLOCK(FletchingTable); + INIT_BLOCK(FlowerPot); + INIT_BLOCK(FloweringAzalea); + INIT_BLOCK(FlowingLava); + INIT_BLOCK(FlowingWater); + INIT_BLOCK(FrogSpawn); + INIT_BLOCK(FrostedIce); + INIT_BLOCK(Furnace); + INIT_BLOCK(GildedBlackstone); + INIT_BLOCK(Glass); + INIT_BLOCK(GlassPane); + INIT_BLOCK(GlowItemFrame); + INIT_BLOCK(GlowLichen); + INIT_BLOCK(GlowingObsidian); + INIT_BLOCK(Glowstone); + INIT_BLOCK(GoldBlock); + INIT_BLOCK(GoldOre); + INIT_BLOCK(GoldenRail); + INIT_BLOCK(GraniteStairs); + INIT_BLOCK(Grass); + INIT_BLOCK(GrassPath); + INIT_BLOCK(Gravel); + INIT_BLOCK(GrayCandle); + INIT_BLOCK(GrayCandleCake); + INIT_BLOCK(GrayCarpet); + INIT_BLOCK(GrayGlazedTerracotta); + INIT_BLOCK(GrayWool); + INIT_BLOCK(GreenCandle); + INIT_BLOCK(GreenCandleCake); + INIT_BLOCK(GreenCarpet); + INIT_BLOCK(GreenGlazedTerracotta); + INIT_BLOCK(GreenWool); + INIT_BLOCK(Grindstone); + INIT_BLOCK(HangingRoots); + INIT_BLOCK(HardGlass); + INIT_BLOCK(HardGlassPane); + INIT_BLOCK(HardStainedGlass); + INIT_BLOCK(HardStainedGlassPane); + INIT_BLOCK(HardenedClay); + INIT_BLOCK(HayBlock); + INIT_BLOCK(HeavyWeightedPressurePlate); + INIT_BLOCK(HoneyBlock); + INIT_BLOCK(HoneycombBlock); + INIT_BLOCK(Hopper); + INIT_BLOCK(HornCoral); + INIT_BLOCK(Ice); + INIT_BLOCK(InfestedDeepslate); + INIT_BLOCK(InfoUpdate); + INIT_BLOCK(InfoUpdate2); + INIT_BLOCK(InvisibleBedrock); + INIT_BLOCK(IronBars); + INIT_BLOCK(IronBlock); + INIT_BLOCK(IronDoor); + INIT_BLOCK(IronOre); + INIT_BLOCK(IronTrapdoor); + INIT_BLOCK(ItemFrame); + INIT_BLOCK(Jigsaw); + INIT_BLOCK(Jukebox); + INIT_BLOCK(JungleButton); + INIT_BLOCK(JungleDoor); + INIT_BLOCK(JungleFence); + INIT_BLOCK(JungleFenceGate); + INIT_BLOCK(JungleHangingSign); + INIT_BLOCK(JungleLog); + INIT_BLOCK(JunglePressurePlate); + INIT_BLOCK(JungleStairs); + INIT_BLOCK(JungleStandingSign); + INIT_BLOCK(JungleTrapdoor); + INIT_BLOCK(JungleWallSign); + INIT_BLOCK(Kelp); + INIT_BLOCK(Ladder); + INIT_BLOCK(Lantern); + INIT_BLOCK(LapisBlock); + INIT_BLOCK(LapisOre); + INIT_BLOCK(LargeAmethystBud); + INIT_BLOCK(Lava); + INIT_BLOCK(Leaves); + INIT_BLOCK(Leaves2); + INIT_BLOCK(Lectern); + INIT_BLOCK(Lever); + INIT_BLOCK(LightBlock); + INIT_BLOCK(LightBlueCandle); + INIT_BLOCK(LightBlueCandleCake); + INIT_BLOCK(LightBlueCarpet); + INIT_BLOCK(LightBlueGlazedTerracotta); + INIT_BLOCK(LightBlueWool); + INIT_BLOCK(LightGrayCandle); + INIT_BLOCK(LightGrayCandleCake); + INIT_BLOCK(LightGrayCarpet); + INIT_BLOCK(LightGrayWool); + INIT_BLOCK(LightWeightedPressurePlate); + INIT_BLOCK(LightningRod); + INIT_BLOCK(LimeCandle); + INIT_BLOCK(LimeCandleCake); + INIT_BLOCK(LimeCarpet); + INIT_BLOCK(LimeGlazedTerracotta); + INIT_BLOCK(LimeWool); + INIT_BLOCK(LitBlastFurnace); + INIT_BLOCK(LitDeepslateRedstoneOre); + INIT_BLOCK(LitFurnace); + INIT_BLOCK(LitPumpkin); + INIT_BLOCK(LitRedstoneLamp); + INIT_BLOCK(LitRedstoneOre); + INIT_BLOCK(LitSmoker); + INIT_BLOCK(Lodestone); + INIT_BLOCK(Loom); + INIT_BLOCK(MagentaCandle); + INIT_BLOCK(MagentaCandleCake); + INIT_BLOCK(MagentaCarpet); + INIT_BLOCK(MagentaGlazedTerracotta); + INIT_BLOCK(MagentaWool); + INIT_BLOCK(Magma); + INIT_BLOCK(MangroveButton); + INIT_BLOCK(MangroveDoor); + INIT_BLOCK(MangroveDoubleSlab); + INIT_BLOCK(MangroveFence); + INIT_BLOCK(MangroveFenceGate); + INIT_BLOCK(MangroveHangingSign); + INIT_BLOCK(MangroveLeaves); + INIT_BLOCK(MangroveLog); + INIT_BLOCK(MangrovePlanks); + INIT_BLOCK(MangrovePressurePlate); + INIT_BLOCK(MangrovePropagule); + INIT_BLOCK(MangroveRoots); + INIT_BLOCK(MangroveSlab); + INIT_BLOCK(MangroveStairs); + INIT_BLOCK(MangroveStandingSign); + INIT_BLOCK(MangroveTrapdoor); + INIT_BLOCK(MangroveWallSign); + INIT_BLOCK(MangroveWood); + INIT_BLOCK(MediumAmethystBud); + INIT_BLOCK(MelonBlock); + INIT_BLOCK(MelonStem); + INIT_BLOCK(MobSpawner); + INIT_BLOCK(MonsterEgg); + INIT_BLOCK(MossBlock); + INIT_BLOCK(MossCarpet); + INIT_BLOCK(MossyCobblestone); + INIT_BLOCK(MossyCobblestoneStairs); + INIT_BLOCK(MossyStoneBrickStairs); + INIT_BLOCK(MovingBlock); + INIT_BLOCK(Mud); + INIT_BLOCK(MudBrickDoubleSlab); + INIT_BLOCK(MudBrickSlab); + INIT_BLOCK(MudBrickStairs); + INIT_BLOCK(MudBrickWall); + INIT_BLOCK(MudBricks); + INIT_BLOCK(MuddyMangroveRoots); + INIT_BLOCK(Mycelium); + INIT_BLOCK(MysteriousFrame); + INIT_BLOCK(MysteriousFrameSlot); + INIT_BLOCK(NetherBrickBlockName); + INIT_BLOCK(NetherBrickFence); + INIT_BLOCK(NetherBrickStairs); + INIT_BLOCK(NetherGoldOre); + INIT_BLOCK(NetherSprouts); + INIT_BLOCK(NetherWart); + INIT_BLOCK(NetherWartBlock); + INIT_BLOCK(NetheriteBlock); + INIT_BLOCK(Netherrack); + INIT_BLOCK(Netherreactor); + INIT_BLOCK(NormalStoneStairs); + INIT_BLOCK(Noteblock); + INIT_BLOCK(OakFence); + INIT_BLOCK(OakHangingSign); + INIT_BLOCK(OakLog); + INIT_BLOCK(OakStairs); + INIT_BLOCK(Observer); + INIT_BLOCK(Obsidian); + INIT_BLOCK(OchreFroglight); + INIT_BLOCK(OrangeCandle); + INIT_BLOCK(OrangeCandleCake); + INIT_BLOCK(OrangeCarpet); + INIT_BLOCK(OrangeGlazedTerracotta); + INIT_BLOCK(OrangeWool); + INIT_BLOCK(OxidizedCopper); + INIT_BLOCK(OxidizedCutCopper); + INIT_BLOCK(OxidizedCutCopperSlab); + INIT_BLOCK(OxidizedCutCopperStairs); + INIT_BLOCK(OxidizedDoubleCutCopperSlab); + INIT_BLOCK(PackedIce); + INIT_BLOCK(PackedMud); + INIT_BLOCK(PearlescentFroglight); + INIT_BLOCK(PinkCandle); + INIT_BLOCK(PinkCandleCake); + INIT_BLOCK(PinkCarpet); + INIT_BLOCK(PinkGlazedTerracotta); + INIT_BLOCK(PinkPetals); + INIT_BLOCK(PinkWool); + INIT_BLOCK(Piston); + INIT_BLOCK(PistonArmCollision); + INIT_BLOCK(PitcherCrop); + INIT_BLOCK(PitcherPlant); + INIT_BLOCK(Planks); + INIT_BLOCK(Podzol); + INIT_BLOCK(PointedDripstone); + INIT_BLOCK(PolishedAndesiteStairs); + INIT_BLOCK(PolishedBasalt); + INIT_BLOCK(PolishedBlackstone); + INIT_BLOCK(PolishedBlackstoneBrickDoubleSlab); + INIT_BLOCK(PolishedBlackstoneBrickSlab); + INIT_BLOCK(PolishedBlackstoneBrickStairs); + INIT_BLOCK(PolishedBlackstoneBrickWall); + INIT_BLOCK(PolishedBlackstoneBricks); + INIT_BLOCK(PolishedBlackstoneButton); + INIT_BLOCK(PolishedBlackstoneDoubleSlab); + INIT_BLOCK(PolishedBlackstonePressurePlate); + INIT_BLOCK(PolishedBlackstoneSlab); + INIT_BLOCK(PolishedBlackstoneStairs); + INIT_BLOCK(PolishedBlackstoneWall); + INIT_BLOCK(PolishedDeepslate); + INIT_BLOCK(PolishedDeepslateDoubleSlab); + INIT_BLOCK(PolishedDeepslateSlab); + INIT_BLOCK(PolishedDeepslateStairs); + INIT_BLOCK(PolishedDeepslateWall); + INIT_BLOCK(PolishedDioriteStairs); + INIT_BLOCK(PolishedGraniteStairs); + INIT_BLOCK(Portal); + INIT_BLOCK(Potatoes); + INIT_BLOCK(PowderSnow); + INIT_BLOCK(PoweredComparator); + INIT_BLOCK(PoweredRepeater); + INIT_BLOCK(Prismarine); + INIT_BLOCK(PrismarineBricksStairs); + INIT_BLOCK(PrismarineStairs); + INIT_BLOCK(Pumpkin); + INIT_BLOCK(PumpkinStem); + INIT_BLOCK(PurpleCandle); + INIT_BLOCK(PurpleCandleCake); + INIT_BLOCK(PurpleCarpet); + INIT_BLOCK(PurpleGlazedTerracotta); + INIT_BLOCK(PurpleWool); + INIT_BLOCK(PurpurBlock); + INIT_BLOCK(PurpurStairs); + INIT_BLOCK(QuartzBlock); + INIT_BLOCK(QuartzBricks); + INIT_BLOCK(QuartzOre); + INIT_BLOCK(QuartzStairs); + INIT_BLOCK(Rail); + INIT_BLOCK(RawCopperBlock); + INIT_BLOCK(RawGoldBlock); + INIT_BLOCK(RawIronBlock); + INIT_BLOCK(RedCandle); + INIT_BLOCK(RedCandleCake); + INIT_BLOCK(RedCarpet); + INIT_BLOCK(RedFlower); + INIT_BLOCK(RedGlazedTerracotta); + INIT_BLOCK(RedMushroom); + INIT_BLOCK(RedMushroomBlock); + INIT_BLOCK(RedNetherBrick); + INIT_BLOCK(RedNetherBrickStairs); + INIT_BLOCK(RedSandstone); + INIT_BLOCK(RedSandstoneStairs); + INIT_BLOCK(RedWool); + INIT_BLOCK(RedstoneBlock); + INIT_BLOCK(RedstoneLamp); + INIT_BLOCK(RedstoneOre); + INIT_BLOCK(RedstoneTorch); + INIT_BLOCK(RedstoneWire); + INIT_BLOCK(Reeds); + INIT_BLOCK(ReinforcedDeepslate); + INIT_BLOCK(RepeatingCommandBlock); + INIT_BLOCK(Reserved6); + INIT_BLOCK(RespawnAnchor); + INIT_BLOCK(Sand); + INIT_BLOCK(Sandstone); + INIT_BLOCK(SandstoneStairs); + INIT_BLOCK(Sapling); + INIT_BLOCK(Scaffolding); + INIT_BLOCK(Sculk); + INIT_BLOCK(SculkCatalyst); + INIT_BLOCK(SculkSensor); + INIT_BLOCK(SculkShrieker); + INIT_BLOCK(SculkVein); + INIT_BLOCK(SeaLantern); + INIT_BLOCK(SeaPickle); + INIT_BLOCK(Seagrass); + INIT_BLOCK(Shroomlight); + INIT_BLOCK(ShulkerBox); + INIT_BLOCK(SilverGlazedTerracotta); + INIT_BLOCK(Skull); + INIT_BLOCK(SlimeBlock); + INIT_BLOCK(SmallAmethystBud); + INIT_BLOCK(SmallDripleaf); + INIT_BLOCK(SmithingTable); + INIT_BLOCK(Smoker); + INIT_BLOCK(SmoothBasalt); + INIT_BLOCK(SmoothQuartzStairs); + INIT_BLOCK(SmoothRedSandstoneStairs); + INIT_BLOCK(SmoothSandstoneStairs); + INIT_BLOCK(SmoothStone); + INIT_BLOCK(SnifferEgg); + INIT_BLOCK(Snow); + INIT_BLOCK(SnowLayer); + INIT_BLOCK(SoulCampfire); + INIT_BLOCK(SoulFire); + INIT_BLOCK(SoulLantern); + INIT_BLOCK(SoulSand); + INIT_BLOCK(SoulSoil); + INIT_BLOCK(SoulTorch); + INIT_BLOCK(Sponge); + INIT_BLOCK(SporeBlossom); + INIT_BLOCK(SpruceButton); + INIT_BLOCK(SpruceDoor); + INIT_BLOCK(SpruceFence); + INIT_BLOCK(SpruceFenceGate); + INIT_BLOCK(SpruceHangingSign); + INIT_BLOCK(SpruceLog); + INIT_BLOCK(SprucePressurePlate); + INIT_BLOCK(SpruceStairs); + INIT_BLOCK(SpruceStandingSign); + INIT_BLOCK(SpruceTrapdoor); + INIT_BLOCK(SpruceWallSign); + INIT_BLOCK(StainedGlass); + INIT_BLOCK(StainedGlassPane); + INIT_BLOCK(StainedHardenedClay); + INIT_BLOCK(StandingBanner); + INIT_BLOCK(StandingSign); + INIT_BLOCK(StickyPiston); + INIT_BLOCK(StickyPistonArmCollision); + INIT_BLOCK(Stone); + INIT_BLOCK(StoneBrickStairs); + INIT_BLOCK(StoneBricks); + INIT_BLOCK(StoneButton); + INIT_BLOCK(StonePressurePlate); + INIT_BLOCK(StoneSlab); + INIT_BLOCK(StoneSlab2); + INIT_BLOCK(StoneSlab3); + INIT_BLOCK(StoneSlab4); + INIT_BLOCK(StoneStairs); + INIT_BLOCK(Stonecutter); + INIT_BLOCK(StonecutterBlock); + INIT_BLOCK(StrippedAcaciaLog); + INIT_BLOCK(StrippedBambooBlock); + INIT_BLOCK(StrippedBirchLog); + INIT_BLOCK(StrippedCherryLog); + INIT_BLOCK(StrippedCherryWood); + INIT_BLOCK(StrippedCrimsonHyphae); + INIT_BLOCK(StrippedCrimsonStem); + INIT_BLOCK(StrippedDarkOakLog); + INIT_BLOCK(StrippedJungleLog); + INIT_BLOCK(StrippedMangroveLog); + INIT_BLOCK(StrippedMangroveWood); + INIT_BLOCK(StrippedOakLog); + INIT_BLOCK(StrippedSpruceLog); + INIT_BLOCK(StrippedWarpedHyphae); + INIT_BLOCK(StrippedWarpedStem); + INIT_BLOCK(StructureBlock); + INIT_BLOCK(StructureVoid); + INIT_BLOCK(SuspiciousGravel); + INIT_BLOCK(SuspiciousSand); + INIT_BLOCK(SweetBerryBush); + INIT_BLOCK(TallGrass); + INIT_BLOCK(Target); + INIT_BLOCK(TintedGlass); + INIT_BLOCK(Tnt); + INIT_BLOCK(Torch); + INIT_BLOCK(Torchflower); + INIT_BLOCK(TorchflowerCrop); + INIT_BLOCK(Trapdoor); + INIT_BLOCK(TrappedChest); + INIT_BLOCK(TripWire); + INIT_BLOCK(TripWireHook); + INIT_BLOCK(TubeCoral); + INIT_BLOCK(Tuff); + INIT_BLOCK(TurtleEgg); + INIT_BLOCK(TwistingVines); + INIT_BLOCK(UnderwaterTorch); + INIT_BLOCK(UndyedShulkerBox); + INIT_BLOCK(UnlitRedstoneTorch); + INIT_BLOCK(UnpoweredComparator); + INIT_BLOCK(UnpoweredRepeater); + INIT_BLOCK(VerdantFroglight); + INIT_BLOCK(Vine); + INIT_BLOCK(WallBanner); + INIT_BLOCK(WallSign); + INIT_BLOCK(WarpedButton); + INIT_BLOCK(WarpedDoor); + INIT_BLOCK(WarpedDoubleSlab); + INIT_BLOCK(WarpedFence); + INIT_BLOCK(WarpedFenceGate); + INIT_BLOCK(WarpedFungus); + INIT_BLOCK(WarpedHangingSign); + INIT_BLOCK(WarpedHyphae); + INIT_BLOCK(WarpedNylium); + INIT_BLOCK(WarpedPlanks); + INIT_BLOCK(WarpedPressurePlate); + INIT_BLOCK(WarpedRoots); + INIT_BLOCK(WarpedSlab); + INIT_BLOCK(WarpedStairs); + INIT_BLOCK(WarpedStandingSign); + INIT_BLOCK(WarpedStem); + INIT_BLOCK(WarpedTrapdoor); + INIT_BLOCK(WarpedWallSign); + INIT_BLOCK(WarpedWartBlock); + INIT_BLOCK(Water); + INIT_BLOCK(WaterLily); + INIT_BLOCK(WaxedCopper); + INIT_BLOCK(WaxedCutCopper); + INIT_BLOCK(WaxedCutCopperSlab); + INIT_BLOCK(WaxedCutCopperStairs); + INIT_BLOCK(WaxedDoubleCutCopperSlab); + INIT_BLOCK(WaxedExposedCopper); + INIT_BLOCK(WaxedExposedCutCopper); + INIT_BLOCK(WaxedExposedCutCopperSlab); + INIT_BLOCK(WaxedExposedCutCopperStairs); + INIT_BLOCK(WaxedExposedDoubleCutCopperSlab); + INIT_BLOCK(WaxedOxidizedCopper); + INIT_BLOCK(WaxedOxidizedCutCopper); + INIT_BLOCK(WaxedOxidizedCutCopperSlab); + INIT_BLOCK(WaxedOxidizedCutCopperStairs); + INIT_BLOCK(WaxedOxidizedDoubleCutCopperSlab); + INIT_BLOCK(WaxedWeatheredCopper); + INIT_BLOCK(WaxedWeatheredCutCopper); + INIT_BLOCK(WaxedWeatheredCutCopperSlab); + INIT_BLOCK(WaxedWeatheredCutCopperStairs); + INIT_BLOCK(WaxedWeatheredDoubleCutCopperSlab); + INIT_BLOCK(WeatheredCopper); + INIT_BLOCK(WeatheredCutCopper); + INIT_BLOCK(WeatheredCutCopperSlab); + INIT_BLOCK(WeatheredCutCopperStairs); + INIT_BLOCK(WeatheredDoubleCutCopperSlab); + INIT_BLOCK(Web); + INIT_BLOCK(WeepingVines); + INIT_BLOCK(Wheat); + INIT_BLOCK(WhiteCandle); + INIT_BLOCK(WhiteCandleCake); + INIT_BLOCK(WhiteCarpet); + INIT_BLOCK(WhiteGlazedTerracotta); + INIT_BLOCK(WhiteWool); + INIT_BLOCK(WitherRose); + INIT_BLOCK(Wood); + INIT_BLOCK(WoodenButton); + INIT_BLOCK(WoodenDoor); + INIT_BLOCK(WoodenPressurePlate); + INIT_BLOCK(WoodenSlab); + INIT_BLOCK(YellowCandle); + INIT_BLOCK(YellowCandleCake); + INIT_BLOCK(YellowCarpet); + INIT_BLOCK(YellowFlower); + INIT_BLOCK(YellowGlazedTerracotta); + INIT_BLOCK(YellowWool); } }; // namespace StaticVanillaBlocks diff --git a/LiteLoader/src/llapi/network/PacketAPI.cpp b/LiteLoader/src/llapi/network/PacketAPI.cpp index 3ec6a52a29..6e15da9362 100644 --- a/LiteLoader/src/llapi/network/PacketAPI.cpp +++ b/LiteLoader/src/llapi/network/PacketAPI.cpp @@ -776,12 +776,12 @@ static_assert(sizeof(StructureTemplateDataResponsePacket) == 0x60, "size of Stru static_assert(sizeof(ClientCacheBlobStatusPacket) == 0x60, "size of ClientCacheBlobStatusPacket should be 96"); static_assert(sizeof(ClientCacheMissResponsePacket) == 0x88, "size of ClientCacheMissResponsePacket should be 136"); static_assert(sizeof(EducationSettingsPacket) == 0x178, "size of EducationSettingsPacket should be 376"); -static_assert(sizeof(EmotePacket) == 0x60, "size of EmotePacket should be 96"); +static_assert(sizeof(EmotePacket) == 0xA0, "size of EmotePacket should be 160"); static_assert(sizeof(MultiplayerSettingsPacket) == 0x38, "size of MultiplayerSettingsPacket should be 56"); static_assert(sizeof(SettingsCommandPacket) == 0x58, "size of SettingsCommandPacket should be 88"); static_assert(sizeof(AnvilDamagePacket) == 0x40, "size of AnvilDamagePacket should be 64"); static_assert(sizeof(CompletedUsingItemPacket) == 0x38, "size of CompletedUsingItemPacket should be 56"); -static_assert(sizeof(NetworkSettingsPacket) == 0x48, "size of NetworkSettingsPacket should be 72"); +static_assert(sizeof(NetworkSettingsPacket) == 0x40, "size of NetworkSettingsPacket should be 64"); static_assert(sizeof(PlayerAuthInputPacket) == 0xB8, "size of PlayerAuthInputPacket should be 184"); static_assert(sizeof(CreativeContentPacket) == 0x50, "size of CreativeContentPacket should be 80"); static_assert(sizeof(PlayerEnchantOptionsPacket) == 0x48, "size of PlayerEnchantOptionsPacket should be 72"); @@ -977,12 +977,12 @@ static_assert(sizeof(StructureTemplateDataResponsePacket) == 0x60 || sizeof(Stru static_assert(sizeof(ClientCacheBlobStatusPacket) == 0x60 || sizeof(ClientCacheBlobStatusPacket) == 48, "size of ClientCacheBlobStatusPacket should be 96 or 48(default)"); static_assert(sizeof(ClientCacheMissResponsePacket) == 0x88 || sizeof(ClientCacheMissResponsePacket) == 48, "size of ClientCacheMissResponsePacket should be 136 or 48(default)"); static_assert(sizeof(EducationSettingsPacket) == 0x178 || sizeof(EducationSettingsPacket) == 48, "size of EducationSettingsPacket should be 376 or 48(default)"); -static_assert(sizeof(EmotePacket) == 0x60 || sizeof(EmotePacket) == 48, "size of EmotePacket should be 96 or 48(default)"); +static_assert(sizeof(EmotePacket) == 0xA0 || sizeof(EmotePacket) == 48, "size of EmotePacket should be 160 or 48(default)"); static_assert(sizeof(MultiplayerSettingsPacket) == 0x38 || sizeof(MultiplayerSettingsPacket) == 48, "size of MultiplayerSettingsPacket should be 56 or 48(default)"); static_assert(sizeof(SettingsCommandPacket) == 0x58 || sizeof(SettingsCommandPacket) == 48, "size of SettingsCommandPacket should be 88 or 48(default)"); static_assert(sizeof(AnvilDamagePacket) == 0x40 || sizeof(AnvilDamagePacket) == 48, "size of AnvilDamagePacket should be 64 or 48(default)"); static_assert(sizeof(CompletedUsingItemPacket) == 0x38 || sizeof(CompletedUsingItemPacket) == 48, "size of CompletedUsingItemPacket should be 56 or 48(default)"); -static_assert(sizeof(NetworkSettingsPacket) == 0x48 || sizeof(NetworkSettingsPacket) == 48, "size of NetworkSettingsPacket should be 72 or 48(default)"); +static_assert(sizeof(NetworkSettingsPacket) == 0x40 || sizeof(NetworkSettingsPacket) == 48, "size of NetworkSettingsPacket should be 64 or 48(default)"); static_assert(sizeof(PlayerAuthInputPacket) == 0xB8 || sizeof(PlayerAuthInputPacket) == 48, "size of PlayerAuthInputPacket should be 184 or 48(default)"); static_assert(sizeof(CreativeContentPacket) == 0x50 || sizeof(CreativeContentPacket) == 48, "size of CreativeContentPacket should be 80 or 48(default)"); static_assert(sizeof(PlayerEnchantOptionsPacket) == 0x48 || sizeof(PlayerEnchantOptionsPacket) == 48, "size of PlayerEnchantOptionsPacket should be 72 or 48(default)"); diff --git a/ScriptEngine/src/api/BlockAPI.cpp b/ScriptEngine/src/api/BlockAPI.cpp index 910d0f4b80..6678209c89 100644 --- a/ScriptEngine/src/api/BlockAPI.cpp +++ b/ScriptEngine/src/api/BlockAPI.cpp @@ -236,7 +236,7 @@ Local BlockClass::isThinFenceBlock() { Local BlockClass::isHeavyBlock() { try { - return Boolean::newBoolean(block->isHeavy()); + return Boolean::newBoolean(block->isFallingBlock()); } CATCH("Fail in isHeavyBlock!"); } diff --git a/ScriptEngine/src/api/DeviceAPI.cpp b/ScriptEngine/src/api/DeviceAPI.cpp index 2f3d849f70..83e18b1c78 100644 --- a/ScriptEngine/src/api/DeviceAPI.cpp +++ b/ScriptEngine/src/api/DeviceAPI.cpp @@ -18,8 +18,8 @@ ClassDefine DeviceClassBuilder = .instanceProperty("lastPing", &DeviceClass::getLastPing) .instanceProperty("lastPacketLoss", &DeviceClass::getLastPacketLoss) .instanceProperty("os", &DeviceClass::getOs) - .instanceProperty("inputMode", &DeviceClass::getInputMode) - .instanceProperty("playMode", &DeviceClass::getPlayMode) + //.instanceProperty("inputMode", &DeviceClass::getInputMode) + //.instanceProperty("playMode", &DeviceClass::getPlayMode) .instanceProperty("serverAddress", &DeviceClass::getServerAddress) .instanceProperty("clientId", &DeviceClass::getClientId) .build(); @@ -140,24 +140,24 @@ Local DeviceClass::getClientId() { CATCH("Fail in getClientId!") } -Local DeviceClass::getInputMode() { - try { - Player* player = getPlayer(); - if (!player) - return Local(); - - return Number::newNumber((int)player->getInputMode()); - } - CATCH("Fail in getInputMode!") -} - -Local DeviceClass::getPlayMode() { - try { - Player* player = getPlayer(); - if (!player) - return Local(); - - return Number::newNumber((int)player->getPlayMode()); - } - CATCH("Fail in getPlayMode!") -} \ No newline at end of file +//Local DeviceClass::getInputMode() { +// try { +// Player* player = getPlayer(); +// if (!player) +// return Local(); +// +// return Number::newNumber((int)player->getInputMode()); +// } +// CATCH("Fail in getInputMode!") +//} +// +//Local DeviceClass::getPlayMode() { +// try { +// Player* player = getPlayer(); +// if (!player) +// return Local(); +// +// return Number::newNumber((int)player->getPlayMode()); +// } +// CATCH("Fail in getPlayMode!") +//} \ No newline at end of file diff --git a/ScriptEngine/src/api/DeviceAPI.h b/ScriptEngine/src/api/DeviceAPI.h index 77eb303847..96dd69b210 100644 --- a/ScriptEngine/src/api/DeviceAPI.h +++ b/ScriptEngine/src/api/DeviceAPI.h @@ -27,8 +27,8 @@ class DeviceClass : public ScriptClass { Local getLastPing(); Local getLastPacketLoss(); Local getOs(); - Local getInputMode(); - Local getPlayMode(); + //Local getInputMode(); + //Local getPlayMode(); Local getServerAddress(); Local getClientId(); }; diff --git a/ScriptEngine/src/api/EntityAPI.cpp b/ScriptEngine/src/api/EntityAPI.cpp index 3501f746ff..cba0d200c6 100644 --- a/ScriptEngine/src/api/EntityAPI.cpp +++ b/ScriptEngine/src/api/EntityAPI.cpp @@ -23,8 +23,12 @@ #include #include #include +#include +#include +#include #include + using magic_enum::enum_integer; @@ -594,7 +598,8 @@ Local EntityClass::getInLava() { if (!entity) return Local(); - return Boolean::newBoolean(entity->isInLava()); + return Boolean::newBoolean(ActorMobilityUtils::shouldApplyLava( + *(IConstBlockSource*)&entity->getDimensionBlockSourceConst(), entity->getEntityContext())); } CATCH("Fail in getInLava!") } diff --git a/ScriptEngine/src/api/PacketAPI.cpp b/ScriptEngine/src/api/PacketAPI.cpp index 8a766e83d7..3d39e2f707 100644 --- a/ScriptEngine/src/api/PacketAPI.cpp +++ b/ScriptEngine/src/api/PacketAPI.cpp @@ -8,6 +8,7 @@ #include "api/NbtAPI.h" #include "api/NativeAPI.h" #include +#include #include "api/PacketAPI.h" #include @@ -455,4 +456,5 @@ Local BinaryStreamClass::writeCompoundTag(const Arguments& args){ return PacketClass::newPacket(pkt); } CATCH("Fail in BinaryStream createPacket!"); -} \ No newline at end of file +} + diff --git a/ScriptEngine/src/api/PlayerAPI.cpp b/ScriptEngine/src/api/PlayerAPI.cpp index 5f8c921661..ee2a5263e4 100644 --- a/ScriptEngine/src/api/PlayerAPI.cpp +++ b/ScriptEngine/src/api/PlayerAPI.cpp @@ -35,6 +35,9 @@ #include #include #include +#include +#include +#include #include "main/SafeGuardRecord.h" #include #include @@ -802,7 +805,8 @@ Local PlayerClass::getInLava() { if (!player) return Local(); - return Boolean::newBoolean(player->isInLava()); + return Boolean::newBoolean(ActorMobilityUtils::shouldApplyLava( + *(IConstBlockSource*)&player->getDimensionBlockSourceConst(), player->getEntityContext())); } CATCH("Fail in getInLava!") } diff --git a/scripts/LINK.txt b/scripts/LINK.txt index ece74b87b0..f01f4f4f63 100644 --- a/scripts/LINK.txt +++ b/scripts/LINK.txt @@ -1 +1 @@ -https://minecraft.azureedge.net/bin-win/bedrock-server-1.19.81.01.zip \ No newline at end of file +https://minecraft.azureedge.net/bin-win/bedrock-server-1.20.0.01.zip \ No newline at end of file